[svn-r19005] Purpose:

    Commit metadata tagging framework.

Description:

    This check-in contains a new framework whose goal is to apply
    a tag value to each new entry in the metadata cache as it is created. 
    This tag value is such that it relates each piece of metadata to the 
    HDF5 object that it belongs to (dataset, group, et cetera).

    This changeset includes the framework that applies the tags as 
    well as a suite of tests to verify correct tag application, though does
    not yet make use of the tag values to flush/evict individual objects.

    Please refer to the "flush/evict individual objects" RFC for further
    discussion of these changes.

Tested:

    jam, amani, linew (h5committest)
    liberty, abe, blue print

11 files changed, 4407 insertions, 13 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 70f85c2..b0269f2 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -81,6 +81,7 @@ SET (H5_TESTS
     gheap
     #cache
     #cache_api
+    #cache_tagging
     pool
     hyperslab
     istore
@@ -141,12 +142,20 @@ TARGET_LINK_LIBRARIES (cache ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
 
 ADD_TEST (NAME cache COMMAND $<TARGET_FILE:cache>)
 
+#-- Adding test for cache_api
 ADD_EXECUTABLE (cache_api ${HDF5_TEST_SOURCE_DIR}/cache_api.c ${HDF5_TEST_SOURCE_DIR}/cache_common.c)
 H5_NAMING (cache_api)
 TARGET_LINK_LIBRARIES (cache_api ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
 
 ADD_TEST (NAME cache_api COMMAND $<TARGET_FILE:cache_api>)
 
+#-- Adding test for cache_tagging
+ADD_EXECUTABLE (cache_tagging ${HDF5_TEST_SOURCE_DIR}/cache_tagging.c ${HDF5_TEST_SOURCE_DIR}/cache_common.c)
+H5_NAMING (cache_tagging)
+TARGET_LINK_LIBRARIES (cache_tagging ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+
+ADD_TEST (NAME cache_tagging COMMAND $<TARGET_FILE:cache_tagging>)
+
 #-- Adding test for ttsafe
 SET (ttsafe_SRCS
     ttsafe.c
diff --git a/test/Makefile.am b/test/Makefile.am
index d342c17..043e05d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -36,7 +36,7 @@ SCRIPT_DEPEND = error_test$(EXEEXT) err_compat$(EXEEXT)
 # These tests (fheap, btree2) are under development and are not used by
 # the library yet. Move them to the end so that their failure do not block
 # other current library code tests.
-TEST_PROG=testhdf5 lheap ohdr stab gheap cache cache_api \
+TEST_PROG=testhdf5 lheap ohdr stab gheap cache cache_api cache_tagging \
            pool hyperslab istore bittests dt_arith \
            dtypes dsets cmpd_dset extend external objcopy links unlink big mtime     \
            fillval mount flush1 flush2 app_ref enum \
diff --git a/test/Makefile.in b/test/Makefile.in
index b31652b..38b63da 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -77,17 +77,18 @@ am_libh5test_la_OBJECTS = h5test.lo testframe.lo cache_common.lo
 libh5test_la_OBJECTS = $(am_libh5test_la_OBJECTS)
 am__EXEEXT_1 = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \
 	stab$(EXEEXT) gheap$(EXEEXT) cache$(EXEEXT) cache_api$(EXEEXT) \
-	pool$(EXEEXT) hyperslab$(EXEEXT) istore$(EXEEXT) \
-	bittests$(EXEEXT) dt_arith$(EXEEXT) dtypes$(EXEEXT) \
-	dsets$(EXEEXT) cmpd_dset$(EXEEXT) extend$(EXEEXT) \
-	external$(EXEEXT) objcopy$(EXEEXT) links$(EXEEXT) \
-	unlink$(EXEEXT) big$(EXEEXT) mtime$(EXEEXT) fillval$(EXEEXT) \
-	mount$(EXEEXT) flush1$(EXEEXT) flush2$(EXEEXT) \
-	app_ref$(EXEEXT) enum$(EXEEXT) set_extent$(EXEEXT) \
-	ttsafe$(EXEEXT) getname$(EXEEXT) vfd$(EXEEXT) ntypes$(EXEEXT) \
-	dangle$(EXEEXT) dtransform$(EXEEXT) reserved$(EXEEXT) \
-	cross_read$(EXEEXT) freespace$(EXEEXT) mf$(EXEEXT) \
-	farray$(EXEEXT) earray$(EXEEXT) btree2$(EXEEXT) fheap$(EXEEXT)
+	cache_tagging$(EXEEXT) pool$(EXEEXT) hyperslab$(EXEEXT) \
+	istore$(EXEEXT) bittests$(EXEEXT) dt_arith$(EXEEXT) \
+	dtypes$(EXEEXT) dsets$(EXEEXT) cmpd_dset$(EXEEXT) \
+	extend$(EXEEXT) external$(EXEEXT) objcopy$(EXEEXT) \
+	links$(EXEEXT) unlink$(EXEEXT) big$(EXEEXT) mtime$(EXEEXT) \
+	fillval$(EXEEXT) mount$(EXEEXT) flush1$(EXEEXT) \
+	flush2$(EXEEXT) app_ref$(EXEEXT) enum$(EXEEXT) \
+	set_extent$(EXEEXT) ttsafe$(EXEEXT) getname$(EXEEXT) \
+	vfd$(EXEEXT) ntypes$(EXEEXT) dangle$(EXEEXT) \
+	dtransform$(EXEEXT) reserved$(EXEEXT) cross_read$(EXEEXT) \
+	freespace$(EXEEXT) mf$(EXEEXT) farray$(EXEEXT) earray$(EXEEXT) \
+	btree2$(EXEEXT) fheap$(EXEEXT)
 am__EXEEXT_2 = gen_bad_ohdr$(EXEEXT) gen_bogus$(EXEEXT) \
 	gen_cross$(EXEEXT) gen_deflate$(EXEEXT) gen_filters$(EXEEXT) \
 	gen_new_array$(EXEEXT) gen_new_fill$(EXEEXT) \
@@ -121,6 +122,10 @@ cache_api_SOURCES = cache_api.c
 cache_api_OBJECTS = cache_api.$(OBJEXT)
 cache_api_LDADD = $(LDADD)
 cache_api_DEPENDENCIES = libh5test.la $(LIBHDF5)
+cache_tagging_SOURCES = cache_tagging.c
+cache_tagging_OBJECTS = cache_tagging.$(OBJEXT)
+cache_tagging_LDADD = $(LDADD)
+cache_tagging_DEPENDENCIES = libh5test.la $(LIBHDF5)
 cmpd_dset_SOURCES = cmpd_dset.c
 cmpd_dset_OBJECTS = cmpd_dset.$(OBJEXT)
 cmpd_dset_LDADD = $(LDADD)
@@ -399,6 +404,21 @@ DIST_SOURCES = $(libh5test_la_SOURCES) app_ref.c big.c bittests.c \
 	set_extent.c space_overflow.c stab.c tcheck_version.c \
 	$(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c \
 	vfd.c
+DIST_SOURCES = $(libh5test_la_SOURCES) app_ref.c big.c bittests.c \
+	btree2.c cache.c cache_api.c cache_tagging.c cmpd_dset.c \
+	cross_read.c dangle.c dsets.c dt_arith.c dtransform.c dtypes.c \
+	earray.c enum.c err_compat.c error_test.c extend.c external.c \
+	farray.c fheap.c fillval.c flush1.c flush2.c freespace.c \
+	gen_bad_ohdr.c gen_bogus.c gen_cross.c gen_deflate.c \
+	gen_filespace.c gen_filters.c gen_idx.c gen_new_array.c \
+	gen_new_fill.c gen_new_group.c gen_new_mtime.c gen_new_super.c \
+	gen_noencoder.c gen_nullspace.c gen_specmetaread.c \
+	gen_udlinks.c getname.c gheap.c hyperslab.c istore.c lheap.c \
+	links.c mf.c mount.c mtime.c ntypes.c objcopy.c ohdr.c pool.c \
+	reserved.c set_extent.c space_overflow.c stab.c \
+	swmr_generator.c swmr_reader.c swmr_writer.c tcheck_version.c \
+	$(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c \
+	vfd.c
 ETAGS = etags
 CTAGS = ctags
 am__tty_colors = \
@@ -703,7 +723,7 @@ SCRIPT_DEPEND = error_test$(EXEEXT) err_compat$(EXEEXT)
 # These tests (fheap, btree2) are under development and are not used by
 # the library yet. Move them to the end so that their failure do not block
 # other current library code tests.
-TEST_PROG = testhdf5 lheap ohdr stab gheap cache cache_api \
+TEST_PROG = testhdf5 lheap ohdr stab gheap cache cache_api cache_tagging \
            pool hyperslab istore bittests dt_arith \
            dtypes dsets cmpd_dset extend external objcopy links unlink big mtime     \
            fillval mount flush1 flush2 app_ref enum \
@@ -852,6 +872,9 @@ cache$(EXEEXT): $(cache_OBJECTS) $(cache_DEPENDENCIES)
 cache_api$(EXEEXT): $(cache_api_OBJECTS) $(cache_api_DEPENDENCIES) 
 	@rm -f cache_api$(EXEEXT)
 	$(LINK) $(cache_api_OBJECTS) $(cache_api_LDADD) $(LIBS)
+cache_tagging$(EXEEXT): $(cache_tagging_OBJECTS) $(cache_tagging_DEPENDENCIES) 
+	@rm -f cache_tagging$(EXEEXT)
+	$(LINK) $(cache_tagging_OBJECTS) $(cache_tagging_LDADD) $(LIBS)
 cmpd_dset$(EXEEXT): $(cmpd_dset_OBJECTS) $(cmpd_dset_DEPENDENCIES) 
 	@rm -f cmpd_dset$(EXEEXT)
 	$(LINK) $(cmpd_dset_OBJECTS) $(cmpd_dset_LDADD) $(LIBS)
@@ -1037,6 +1060,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache_api.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache_common.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache_tagging.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmpd_dset.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cross_read.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dangle.Po@am__quote@
diff --git a/test/btree2.c b/test/btree2.c
index eabd208..1d1796c 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -107,6 +107,11 @@ create_file(hid_t *file, H5F_t **f, hid_t fapl)
     if(NULL == (*f = (H5F_t *)H5I_object(*file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if(H5AC_ignore_tags(*f) < 0) {
+        STACK_ERROR
+    }
+
     /* Success */
     return(0);
 
@@ -2804,6 +2809,11 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if(H5AC_ignore_tags(f) < 0) {
+        STACK_ERROR
+    }
+
     /* Create the v2 B-tree & get its address */
     if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
         TEST_ERROR
@@ -2838,6 +2848,11 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if(H5AC_ignore_tags(f) < 0) {
+        STACK_ERROR
+    }
+
     /* Re-open v2 B-tree */
     if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f)))
         FAIL_STACK_ERROR
@@ -6363,6 +6378,11 @@ gen_l4_btree2(const char *filename, hid_t fapl, const H5B2_create_t *cparam,
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if(H5AC_ignore_tags(f) < 0) {
+        STACK_ERROR
+    }
+
     /* Create the v2 B-tree & get its address */
     if(create_btree(f, dxpl, cparam, &bt2, bt2_addr) < 0)
         TEST_ERROR
@@ -6514,6 +6534,11 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if(H5AC_ignore_tags(f) < 0) {
+        STACK_ERROR
+    }
+
     /* Re-shuffle record #'s */
     for(u = 0; u < INSERT_MANY; u++) {
         hsize_t     temp_rec;               /* Temporary record */
@@ -6605,6 +6630,11 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if(H5AC_ignore_tags(f) < 0) {
+        STACK_ERROR
+    }
+
     /* Re-open v2 B-tree */
     if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f)))
         FAIL_STACK_ERROR
@@ -6689,6 +6719,11 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if(H5AC_ignore_tags(f) < 0) {
+        STACK_ERROR
+    }
+
     /* Re-open v2 B-tree */
     if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f)))
         FAIL_STACK_ERROR
@@ -6770,6 +6805,11 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if(H5AC_ignore_tags(f) < 0) {
+        STACK_ERROR
+    }
+
     /* Re-open v2 B-tree */
     if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f)))
         FAIL_STACK_ERROR
@@ -7116,6 +7156,11 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam)
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if(H5AC_ignore_tags(f) < 0) {
+        STACK_ERROR
+    }
+
     /* Create the v2 B-tree & get its address */
     if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
         TEST_ERROR
@@ -7156,6 +7201,11 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam)
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if(H5AC_ignore_tags(f) < 0) {
+        STACK_ERROR
+    }
+
     /* Create the v2 B-tree & get its address */
     if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
         TEST_ERROR
@@ -7209,6 +7259,11 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam)
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if(H5AC_ignore_tags(f) < 0) {
+        STACK_ERROR
+    }
+
     /* Create the v2 B-tree & get its address */
     if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
         TEST_ERROR
@@ -7262,6 +7317,11 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam)
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if(H5AC_ignore_tags(f) < 0) {
+        STACK_ERROR
+    }
+
     /* Create the v2 B-tree & get its address */
     if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
         TEST_ERROR
diff --git a/test/cache_common.c b/test/cache_common.c
index 3de01c5..312de3d 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -2689,6 +2689,9 @@ setup_cache(size_t max_cache_size,
 
     if ( pass ) {
 
+        /* Need to set this else all cache tests will fail */
+        cache_ptr->ignore_tags = TRUE;
+
         H5C_stats__reset(cache_ptr);
 
         H5C_set_skip_flags(cache_ptr, TRUE, TRUE);
diff --git a/test/cache_tagging.c b/test/cache_tagging.c
new file mode 100644
index 0000000..4ec256e
--- /dev/null
+++ b/test/cache_tagging.c
@@ -0,0 +1,3990 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * 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.     *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* Programmer:  Mike McGreevy
+ *              January 25, 2010
+ *
+ *              This file contains tests for metadata tagging.
+ */
+#include "hdf5.h"
+#include "testhdf5.h"
+#include "h5test.h"
+#include "H5Iprivate.h"
+#include "H5ACprivate.h"
+#include "H5ACpublic.h"
+#include "cache_common.h"
+#include "H5HLprivate.h"
+
+/* ============ */
+/* Test Defines */
+/* ============ */
+
+#define FILENAME "tagging_test.h5"
+#define FILENAME2 "tagging_ext_test.h5"
+#define GROUPNAME "Group"
+#define GROUPNAMEPATH "/Group"
+#define GROUPNAMECOPY "GroupCopy"
+#define ATTRNAME "Attribute 1"
+#define ATTRNAME3 "Attribute 3"
+#define DATASETNAME "Dataset"
+#define DATASETNAME2 "Dataset2"
+#define LINKNAME "Link"
+#define RANK 2
+#define DIMS 32
+
+#define MULTIGROUPS 10
+
+#define TEST_DEFAULT 0
+#define TEST_SHMESG 1
+#define NUM_TEST_TYPES 2
+    
+/* ===================== */
+/* Function Declarations */
+/* ===================== */
+
+/* Helper Functions */
+static void print_entry_type_to_screen(int id);
+static int print_index(hid_t fid);
+static int verify_no_unknown_tags(hid_t fid);
+static int mark_all_entries_investigated(hid_t fid);
+static int verify_tag(hid_t fid, int id, haddr_t tag);
+static int get_new_object_header_tag(hid_t fid, haddr_t *tag);
+/* Tests */
+static unsigned check_file_creation_tags(hid_t fcpl_id, int type);
+static unsigned check_file_open_tags(hid_t fcpl, int type);
+static unsigned check_group_creation_tags(hid_t fcpl, int type);
+static unsigned check_multi_group_creation_tags(hid_t fcpl, int type);
+static unsigned check_group_open_tags(hid_t fcpl, int type);
+static unsigned check_attribute_creation_tags(hid_t fcpl, int type);
+static unsigned check_attribute_open_tags(hid_t fcpl, int type);
+static unsigned check_attribute_write_tags(hid_t fcpl, int type);
+static unsigned check_attribute_delete_tags(hid_t fcpl, int type);
+static unsigned check_attribute_rename_tags(hid_t fcpl, int type);
+static unsigned check_dataset_creation_tags(hid_t fcpl, int type);
+static unsigned check_dataset_creation_earlyalloc_tags(hid_t fcpl, int type);
+static unsigned check_dataset_open_tags(hid_t fcpl, int type);
+static unsigned check_dataset_write_tags(hid_t fcpl, int type);
+static unsigned check_dataset_read_tags(hid_t fcpl, int type);
+static unsigned check_dataset_size_retrieval(hid_t fcpl, int type);
+static unsigned check_dataset_extend_tags(hid_t fcpl, int type);
+static unsigned check_object_info_tags(hid_t fcpl, int type);
+static unsigned check_link_removal_tags(hid_t fcpl, int type);
+static unsigned check_link_getname_tags(hid_t fcpl, int type);
+static unsigned check_external_link_creation_tags(hid_t fcpl, int type);
+static unsigned check_external_link_open_tags(hid_t fcpl, int type);
+static unsigned check_object_copy_tags(hid_t fcpl, int type);
+
+static unsigned check_dense_attribute_tags(void);
+static unsigned check_link_iteration_tags(void);
+static unsigned check_invalid_tag_application(void);
+
+
+/* ================ */
+/* Helper Functions */
+/* ================ */
+
+
+/*-------------------------------------------------------------------------
+ *
+ * Function:    print_entry_type_to_screen
+ *
+ * Purpose:     DEBUG CODE (for when verbose is set).
+ *
+ *              Prints type of entry to stdout.
+ *
+ * Return:      void
+ *
+ * Programmer:  Mike McGreevy
+ *              September 3, 2009
+ *
+ *-------------------------------------------------------------------------
+ */
+static void
+print_entry_type_to_screen(int id)
+{
+    printf("Type = ");
+    
+    switch (id) {
+    
+        case 0:
+            printf("B-tree Node");
+            break;
+        case 1: 
+            printf("Symbol Table Node");
+            break;
+        case 2:
+            printf("Local Heap Prefix");
+            break;
+        case 3:
+            printf("Local Heap Data Block");
+            break;
+        case 4:
+            printf("Global Heap");
+            break;
+        case 5:
+            printf("Object Header");
+            break;
+        case 6:
+            printf("Object Header Chunk");
+            break;
+        case 7:
+            printf("v2 B-tree Header");
+            break;
+        case 8:
+            printf("v2 B-tree Internal Node");
+            break;
+        case 9:
+            printf("v2 B-tree Leaf Node");
+            break;
+        case 10:
+            printf("Fractal Heap Header");
+            break;
+        case 11:
+            printf("Fractal Heap Direct Block");
+            break;
+        case 12:
+            printf("Fractal Heap Indirect Block");
+            break;
+        case 13:
+            printf("Free Space Header");
+            break;
+        case 14:
+            printf("Free Space Section");
+            break;
+        case 15:
+            printf("Shared Object Header Message Master Table");
+            break;
+        case 16:
+            printf("Shared Message Index Stored As A List");
+            break;
+        case 17:
+            printf("Extensible Array Header");
+            break;
+        case 18:
+            printf("Extensible Array Index Block");
+            break;
+        case 19:
+            printf("Extensible Array Super Block");
+            break;
+        case 20:
+            printf("Extensible Array Data Block");
+            break;
+        case 21:
+            printf("Extensible Array Data Block Page");
+            break;
+        case 22:
+            printf("Chunk Proxy");
+            break;
+        case 23:
+            printf("Fixed Array Header");
+            break;
+        case 24:
+            printf("Fixed Array Data Block");
+            break;
+        case 25:
+            printf("Fixed Array Data Block Page");
+            break;
+        case 26:
+            printf("File Superblock");
+            break;
+        case 27:
+            printf("Test Entry");
+            break;
+        case 28:
+            printf("Number of Types");
+            break;
+        default:
+            printf("*Unknown*");
+            break;
+
+    } /* end switch */
+
+} /* print_entry_type_to_screen */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    print_index()
+ *
+ * Purpose:     DEBUG CODE (for when verbose is set).
+ *
+ *              Prints cache index to screen, including address of entries,
+ *              tag values of entries, and entry types.
+ *
+ * Return:      void
+ *
+ * Programmer:  Mike McGreevy
+ *              January 25, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static int print_index(hid_t fid) {
+
+    H5F_t * f = NULL;         /* File Pointer */
+    H5C_t * cache_ptr = NULL; /* Cache Pointer */
+    int i = 0; /* Iterator */
+    H5C_cache_entry_t *next_entry_ptr = NULL; /* entry pointer */
+
+    /* Get Internal File / Cache Pointers */
+    if ( NULL == (f = (H5F_t *)H5I_object(fid)) ) TEST_ERROR;
+    cache_ptr = f->shared->cache;
+
+    /* Initial (debugging) loop */
+    printf("CACHE SNAPSHOT:\n");
+    for (i = 0; i < H5C__HASH_TABLE_LEN; i++) {
+        next_entry_ptr = cache_ptr->index[i];
+
+        while (next_entry_ptr != NULL) {
+            printf("Addr = %u, ", (unsigned int)next_entry_ptr->addr);
+            printf("Tag = %u, ", (unsigned int)next_entry_ptr->tag);
+            printf("Dirty = %d, ", (int)next_entry_ptr->is_dirty);
+            printf("Protected = %d, ", (int)next_entry_ptr->is_protected);
+            print_entry_type_to_screen(next_entry_ptr->type->id);
+            printf("\n");
+            next_entry_ptr = next_entry_ptr->ht_next;
+        } /* end if */
+
+    } /* end for */
+    printf("\n");
+
+    return 0;
+    
+error:
+
+    return -1;
+
+} /* print_index */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    verify_no_unknown_tags()
+ *
+ * Purpose:     Verifies that all tags in the provided cache are set to the
+ *              H5AC__IGNORE_TAG. Other verification functions in this test
+ *              file set entry tag values to ignore after checking them, so 
+ *              this is handy to verify that tests have checked all entries
+ *              in the cache.
+ *
+ * Return:      0 on Success, -1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              January 25, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static int verify_no_unknown_tags(hid_t fid)
+{
+
+    H5F_t * f = NULL;         /* File Pointer */
+    H5C_t * cache_ptr = NULL; /* Cache Pointer */
+    int i = 0; /* Iterator */
+    H5C_cache_entry_t *next_entry_ptr = NULL; /* entry pointer */
+
+    /* Get Internal File / Cache Pointers */
+    if ( NULL == (f = (H5F_t *)H5I_object(fid)) ) TEST_ERROR;
+    cache_ptr = f->shared->cache;
+
+    for (i = 0; i < H5C__HASH_TABLE_LEN; i++) {
+
+        next_entry_ptr = cache_ptr->index[i];
+
+        while (next_entry_ptr != NULL) {
+
+            if ( next_entry_ptr->tag != H5AC__IGNORE_TAG ) TEST_ERROR;
+
+            next_entry_ptr = next_entry_ptr->ht_next;
+
+        } /* end if */
+
+    } /* for */
+
+    return 0;
+
+error:
+    return -1;
+} /* verify_no_unknown_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    mark_all_entries_investigated()
+ *
+ * Purpose:     Marks all entries in the cache with the tag H5AC__IGNORE_TAG,
+ *              which is a convention in this test file that indicates that
+ *              a tag has been checked and is valid. This may come in handy
+ *              for tests that have a lot of setup that has been checked
+ *              for correctness elsewhere, so should save time in not having
+ *              to check the same sort of tag application in many places.
+ *
+ * Return:      0 on Success, -1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              February 3, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static int mark_all_entries_investigated(hid_t fid)
+{
+
+    H5F_t * f = NULL;         /* File Pointer */
+    H5C_t * cache_ptr = NULL; /* Cache Pointer */
+    int i = 0; /* Iterator */
+    H5C_cache_entry_t *next_entry_ptr = NULL; /* entry pointer */
+
+    /* Get Internal File / Cache Pointers */
+    if ( NULL == (f = (H5F_t *)H5I_object(fid)) ) TEST_ERROR;
+    cache_ptr = f->shared->cache;
+
+    for (i = 0; i < H5C__HASH_TABLE_LEN; i++) {
+
+        next_entry_ptr = cache_ptr->index[i];
+
+        while (next_entry_ptr != NULL) {
+
+            if ( next_entry_ptr->tag != H5AC__IGNORE_TAG ) {
+
+                    next_entry_ptr->tag = H5AC__IGNORE_TAG;
+
+            } /* end if */
+
+            next_entry_ptr = next_entry_ptr->ht_next;
+
+        } /* end if */
+
+    } /* for */
+
+    return 0;
+
+error:
+    return -1;
+
+} /* mark_all_entries_investigated */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    verify_tag()
+ *
+ * Purpose:     Asserts that there is an entry in the specified cache with
+ *              the provided entry id and provided tag. The function will
+ *              fail if this is not the case. If found, this function will 
+ *              set the entry's tag value to ignore, so future verification 
+ *              attemps can skip over this entry, knowing it has already been 
+ *              checked.
+ *
+ * Return:      0 on Success, -1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              January 25, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static int verify_tag(hid_t fid, int id, haddr_t tag)
+{
+    int i = 0;                           /* Iterator */
+    H5C_cache_entry_t *entry_ptr = NULL; /* Entry Pointer */
+    int found = FALSE;                   /* If Entry Found */
+    H5F_t * f = NULL;         /* File Pointer */
+    H5C_t * cache_ptr = NULL; /* Cache Pointer */
+    H5C_cache_entry_t *next_entry_ptr = NULL; /* entry pointer */
+
+    /* Get Internal File / Cache Pointers */
+    if ( NULL == (f = (H5F_t *)H5I_object(fid)) ) TEST_ERROR;
+    cache_ptr = f->shared->cache;
+
+    for (i = 0; i < H5C__HASH_TABLE_LEN; i++) {
+
+        next_entry_ptr = cache_ptr->index[i];
+
+        while (next_entry_ptr != NULL) {
+
+            if ( (next_entry_ptr->type->id == id) && (next_entry_ptr->tag != H5AC__IGNORE_TAG) ) {
+                
+                if (!found) {
+
+                    if (next_entry_ptr->tag != tag) TEST_ERROR;
+
+                    /* note that we've found the entry */
+                    found = TRUE;
+
+                    /* Ignore this tag now that we've verified it was initially tagged correctly. */
+                    next_entry_ptr->tag = H5AC__IGNORE_TAG;
+
+                }
+    
+            } /* end if */
+
+            next_entry_ptr = next_entry_ptr->ht_next;
+
+        } /* end if */
+
+    } /* for */
+
+    if (found == FALSE) TEST_ERROR;
+    
+    return 0;
+
+error:
+    return -1;
+} /* verify_tag */
+
+static int evict_entries(hid_t fid)
+{
+
+    H5F_t * f = NULL;         /* File Pointer */
+
+    /* Get Internal File / Cache Pointers */
+    if ( NULL == (f = (H5F_t *)H5I_object(fid)) ) TEST_ERROR;
+
+    /* Mark all entries investigated */
+    mark_all_entries_investigated(fid);
+
+    /* Evict all we can from the cache to examine full tag creation tree */
+        /* This function will likely return failure since the root group
+         * is still protected. Thus, don't check its return value. */
+    H5C_flush_cache(f, H5P_DEFAULT, H5P_DEFAULT, H5C__FLUSH_INVALIDATE_FLAG);
+
+    return 0;
+
+error:
+
+    return -1;
+
+} /* evict entries */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    get_new_object_header_tag()
+ *
+ * Purpose:     This function retrieves the tag associated with the latest
+ *              uninvestigated object header it finds in the provided cache
+ *              and returns it in *tag. It sets the object header's entry
+ *              tag value to ignore, so future searches won't find it.
+ *
+ * Return:      0 on Success; 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              January 25, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static int get_new_object_header_tag(hid_t fid, haddr_t *tag)
+{
+    H5F_t * f = NULL;         /* File Pointer */
+    H5C_t * cache_ptr = NULL; /* Cache Pointer */
+    int i = 0;                              /* Iterator */
+    H5C_cache_entry_t * next_entry_ptr = NULL;   /* Entry Pointer */
+    int found = FALSE;                      /* If entry is found */
+
+    /* Get Internal File / Cache Pointers */
+    if ( NULL == (f = (H5F_t *)H5I_object(fid)) ) TEST_ERROR;
+    cache_ptr = f->shared->cache;
+
+    for (i = 0; i < H5C__HASH_TABLE_LEN; i++) {
+        
+        next_entry_ptr = cache_ptr->index[i];
+
+        while (next_entry_ptr != NULL) {
+
+            if ( (next_entry_ptr->tag != H5AC__IGNORE_TAG) && (next_entry_ptr->type->id == H5AC_OHDR_ID) ) {
+
+                *tag = next_entry_ptr->tag;
+                next_entry_ptr->tag = H5AC__IGNORE_TAG;
+                found = TRUE;
+                break;
+
+            } /* end if */
+
+            next_entry_ptr = next_entry_ptr->ht_next;
+
+        } /* end if */
+
+        if (found) break;
+
+    } /* end for */
+
+    if (found == FALSE) TEST_ERROR;
+    
+    return 0;
+
+error:
+    return -1;
+} /* get_new_object_header_tag */
+
+/* ============== */
+/* Test Functions */
+/* ============== */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_file_creation_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during file creation.
+ *
+ * Return:      0 on Success; 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              January 25, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_file_creation_tags(hid_t fcpl_id, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;             /* File Identifier */
+    int verbose = FALSE;        /* verbose test outout */
+    haddr_t root_tag = 0;
+    haddr_t sbe_tag = 0;
+
+    /* Testing Macro */
+    TESTING("tag application during file creation");
+
+    /* Create a test file with provided fcpl_t */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* if verbose, print cache index to screen before verification . */
+    if ( verbose ) print_index(fid);
+
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+
+        /* determine tag value of superblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+        /* verify object header chunk belonging to superblock extension */
+        if ( verify_tag(fid, H5AC_OHDR_CHK_ID, sbe_tag) < 0 ) TEST_ERROR;
+
+        /* verify sohm master table with sohm tag */
+        if ( verify_tag(fid, H5AC_SOHM_TABLE_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+
+    }  /* end if */
+
+    /* verify there is a superblock entry with superblock tag */
+    if ( verify_tag(fid, H5AC_SUPERBLOCK_ID, H5AC__SUPERBLOCK_TAG) < 0 ) TEST_ERROR;
+
+    /* verify local heap prefix belonging to root group */
+    if ( verify_tag(fid, H5AC_LHEAP_PRFX_ID, root_tag) < 0 ) TEST_ERROR;
+
+    /* verify b-tree node belonging to root group */
+    if ( verify_tag(fid, H5AC_BT_ID, root_tag) < 0 ) TEST_ERROR;
+
+    /* verify no other cache entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* Close the file */
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+
+} /* check_file_creation_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_file_open_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during file open.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              January 25, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_file_open_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;          /* File Identifier */
+    int verbose = FALSE;     /* verbose file outout */
+    haddr_t root_tag;       /* Root Group Tag */
+    haddr_t sbe_tag;        /* Sblock Extension Tag */
+
+    /* Testing Macro */
+    TESTING("tag application during file open");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create a test file with provided fcpl_t */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+    
+    /* Close the file */
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* =================== */
+    /* TEST: Open The File */
+    /* =================== */
+    if ( (fid = H5Fopen(FILENAME, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen before verification . */
+    if ( verbose ) print_index(fid);
+
+    /* verify there is a superblock entry with superblock tag. */
+    if ( verify_tag(fid, H5AC_SUPERBLOCK_ID, H5AC__SUPERBLOCK_TAG) < 0 ) TEST_ERROR;
+
+    /* Verify test-type-dependent tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* verify there is an object header belonging to the root group. */
+        if ( verify_tag(fid, H5AC_OHDR_ID, root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+
+        /* verify there is a superblock extension object header. */
+        if ( verify_tag(fid, H5AC_OHDR_ID, sbe_tag) < 0 ) TEST_ERROR;
+
+        /* verify sohm master table with sohm tag */
+        if ( verify_tag(fid, H5AC_SOHM_TABLE_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+
+        /* verify object header chunk belonging to superblock extension */
+        if ( verify_tag(fid, H5AC_OHDR_CHK_ID, sbe_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* ========== */
+    /* Close file */
+    /* ========== */
+
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_file_open_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_group_creation_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during group creation.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              January 27, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_group_creation_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;          /* File Identifier */
+    hid_t gid = -1;          /* Group Identifier */
+    int verbose = FALSE;     /* verbose file outout */
+    haddr_t root_tag;       /* Root Group Tag */
+    haddr_t g_tag;          /* Group Tag */
+    haddr_t sbe_tag;        /* Sblock Extension Tag */
+
+    /* Testing Macro */
+    TESTING("tag application during group creation");
+    
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create a test file with provided fcpl_t */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Close and Reopen the file */
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* ==================== */
+    /* TEST: Create a Group */
+    /* ==================== */
+
+    if ( (gid = H5Gcreate(fid, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+ 
+    /* Verify root group's tagged metadata */
+    if ( verify_tag(fid, H5AC_OHDR_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_SNODE_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_LHEAP_PRFX_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT_ID, root_tag) < 0 ) TEST_ERROR;
+
+    /* Verify new group's tagged metadata */
+    if ( get_new_object_header_tag(fid, &g_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT_ID, g_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_LHEAP_PRFX_ID, g_tag) < 0 ) TEST_ERROR;
+
+    /* verify no other cache entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Gclose(gid) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_group_creation_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_multi_group_creation_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during multiple group creation.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              March 2, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_multi_group_creation_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;          /* File Identifier */
+    hid_t gid = -1;          /* Group Identifier */
+    int verbose = FALSE;     /* verbose file outout */
+    char gname[10];          /* group name buffer */
+    int i = 0;               /* iterator */
+    hid_t fapl = -1;         /* File access prop list */
+    haddr_t g_tag = 0;      /* Group tag value */
+    haddr_t root_tag = 0;   /* Root group tag value */
+    haddr_t sbe_tag = 0;   /* Root group tag value */
+
+    /* Testing Macro */
+    TESTING("tag application during multiple group creation");
+
+    /* Create Fapl */
+    if ( (fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0 ) TEST_ERROR;
+
+    /* Set latest version of library */
+    if ( H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0 ) TEST_ERROR;
+
+    /* =========== */
+    /* Create File */
+    /* =========== */
+
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Clear Metadata Tags (don't care about them for this test */
+    mark_all_entries_investigated(fid);
+
+    /* ============ */
+    /* Create Group */
+    /* ============ */
+
+    for (i = 0; i < MULTIGROUPS; i++) {
+
+        sprintf(gname, "%d", i);
+        if ( (gid = H5Gcreate(fid, gname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+        if ( H5Gclose(gid) < 0 ) TEST_ERROR;
+
+    } /* end for */
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* Verify there is an object header for each group */
+    for (i = 0; i < MULTIGROUPS; i++) {
+
+        if ( get_new_object_header_tag(fid, &g_tag) < 0 ) TEST_ERROR;
+
+    } /* end for */
+
+    /* Verify free space header and section info */
+    if ( verify_tag(fid, H5AC_FSPACE_SINFO_ID, H5AC__FREESPACE_TAG) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_FSPACE_HDR_ID, H5AC__FREESPACE_TAG) < 0 ) TEST_ERROR;
+
+    /* verify fractal heap header belonging to root group */
+    if ( verify_tag(fid, H5AC_FHEAP_HDR_ID, root_tag) < 0 ) TEST_ERROR;
+
+    /* verify fractal heap direct block belonging to root group */
+    if ( verify_tag(fid, H5AC_FHEAP_DBLOCK_ID, root_tag) < 0 ) TEST_ERROR;
+
+    /* verify btree header and leaf node belonging to root group */
+    if ( verify_tag(fid, H5AC_BT2_HDR_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT2_LEAF_ID, root_tag) < 0 ) TEST_ERROR;
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_multi_group_creation_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_link_iteration_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during iteration over links in a group.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              March 2, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_link_iteration_tags(void)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;          /* File Identifier */
+    hid_t sid = -1;          /* Group Identifier */
+    hid_t did = -1;          /* Group Identifier */
+    int verbose = FALSE;     /* verbose file outout */
+    int i = 0;               /* iterator */
+    haddr_t root_tag = 0;   /* Root Group Tag Value */
+    char dsetname[500];      /* Name of dataset */
+    H5G_info_t ginfo;        /* Group Info Struct */
+    hid_t root_group = -1;   /* Root Group Identifier */
+
+    /* Testing Macro */
+    TESTING("tag application during iteration over links in a group");
+
+    /* =========== */
+    /* Create File */
+    /* =========== */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Get root group tag */
+    if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    /* Create dataspace */
+    if ( (sid = H5Screate(H5S_SCALAR)) < 0 ) TEST_ERROR;
+
+    /* Create many datasets in root group */
+    for (i=0;i<500;i++) {
+
+        sprintf(dsetname, "Dset %d", i);
+        if ( (did = H5Dcreate2(fid, dsetname, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+        if ( H5Dclose(did) < 0 ) TEST_ERROR;
+    }
+
+    /* Close and Reopen the file (to clear cache) */
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* determine tag value of root group's object header */
+    if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    /* clear remaining metadata tags */
+    mark_all_entries_investigated(fid);
+
+    /* ================================ */
+    /* Iterate over links in root group */
+    /* ================================ */
+
+    /* Open root group */
+    if ( (root_group = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Get root group info (will iterate over all links in group) */
+    if ( H5Gget_info(root_group, &ginfo) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* Verify 112 symbol table nodes belonging to the root group */
+    for (i = 0; i < 112; i++) {
+        if ( verify_tag(fid, H5AC_SNODE_ID, root_tag) < 0 ) TEST_ERROR;
+    }
+
+    /* Verify 9 b-tree nodes belonging to the root group */
+    for (i = 0; i < 9; i++) {
+        if ( verify_tag(fid, H5AC_BT_ID, root_tag) < 0 ) TEST_ERROR;
+    }
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Sclose(sid) < 0 ) TEST_ERROR;
+    if ( H5Gclose(root_group) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_link_iteration_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_dense_attribute_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during various dense attribute manipulations.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              March 2, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_dense_attribute_tags(void)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;          /* File Identifier */
+    hid_t aid = -1;          /* File Identifier */
+    hid_t sid = -1;          /* Group Identifier */
+    hid_t did = -1;          /* Group Identifier */
+    hid_t dcpl = -1;         /* Group Identifier */
+    int verbose = FALSE;     /* verbose file outout */
+    int i = 0;               /* iterator */
+    hid_t fapl = -1;         /* File access property list */
+    haddr_t d_tag = 0;      /* Dataset tag value */
+    haddr_t root_tag = 0;   /* Root group tag value */
+    char attrname[500];      /* Name of attribute */
+
+    /* Testing Macro */
+    TESTING("tag application during dense attribute manipulation");
+
+    /* Create Fapl */
+    if ( (fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0 ) TEST_ERROR;
+    if ( H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0 ) TEST_ERROR;
+
+    /* Create Dcpl */
+    if ( (dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0 ) TEST_ERROR;
+
+    /* =========== */
+    /* Create File */
+    /* =========== */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0 ) TEST_ERROR;
+
+    /* Get root group tag */
+    if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    /* Create dataspace */
+    if ( (sid = H5Screate(H5S_SCALAR)) < 0 ) TEST_ERROR;
+
+    /* Create dataset */
+    if ( (did = H5Dcreate2(fid, DATASETNAME, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+    
+    /* get dataset object header */
+    if ( get_new_object_header_tag(fid, &d_tag) < 0 ) TEST_ERROR;
+    
+    /* Clear Metadata Tags (don't care about them for this test */
+    mark_all_entries_investigated(fid);
+
+    /* ================================================ */
+    /* Create Many attributes, triggering dense storage */
+    /* ================================================ */
+
+    for (i=0;i<50;i++) {
+
+        sprintf(attrname, "attr %d", i);
+        if ( (aid = H5Acreate2(did, attrname, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+        if ( H5Awrite(aid, H5T_NATIVE_UINT, &i) < 0 ) TEST_ERROR;
+        if ( H5Aclose(aid) < 0 ) TEST_ERROR;
+
+    } /* end for */
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* Verify free space header and section info */
+    if ( verify_tag(fid, H5AC_FSPACE_SINFO_ID, H5AC__FREESPACE_TAG) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_FSPACE_HDR_ID, H5AC__FREESPACE_TAG) < 0 ) TEST_ERROR;
+
+    /* verify fractal heap header belonging to dataset */
+    if ( verify_tag(fid, H5AC_FHEAP_HDR_ID, d_tag) < 0 ) TEST_ERROR;
+
+    /* verify fractal heap direct block belonging to root group */
+    if ( verify_tag(fid, H5AC_FHEAP_DBLOCK_ID, d_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_FHEAP_DBLOCK_ID, d_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_FHEAP_IBLOCK_ID, d_tag) < 0 ) TEST_ERROR;
+
+    /* verify btree header and leaf node belonging to dataset */
+    if ( verify_tag(fid, H5AC_BT2_HDR_ID, d_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT2_LEAF_ID, d_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT2_LEAF_ID, d_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT2_INT_ID, d_tag) < 0 ) TEST_ERROR;
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Dclose(did) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ======================= */
+    /* Reopen file and dataset */
+    /* ======================= */
+
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+    if ( (did = H5Dopen2(fid, DATASETNAME, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Clear Metadata Tags (don't care about them for this test */
+    mark_all_entries_investigated(fid);
+
+    /* ======================= */
+    /* Open attribute by index */
+    /* ======================= */
+
+    if ( (aid = H5Aopen_by_idx(did, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)4, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* verify fractal heap header belonging to dataset */
+    if ( verify_tag(fid, H5AC_FHEAP_HDR_ID, d_tag) < 0 ) TEST_ERROR;
+
+    /* verify fractal heap direct block belonging to root group */
+    if ( verify_tag(fid, H5AC_FHEAP_DBLOCK_ID, d_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_FHEAP_DBLOCK_ID, d_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_FHEAP_IBLOCK_ID, d_tag) < 0 ) TEST_ERROR;
+
+    /* verify btree header and leaf node belonging to dataset */
+    if ( verify_tag(fid, H5AC_BT2_HDR_ID, d_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT2_LEAF_ID, d_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT2_LEAF_ID, d_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT2_INT_ID, d_tag) < 0 ) TEST_ERROR;
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Aclose(aid) < 0 ) TEST_ERROR;
+    if ( H5Dclose(did) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_dense_attribute_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_group_open_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during group open.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              January 27, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_group_open_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;          /* File Identifier */
+    hid_t gid = -1;          /* Group Identifier */
+    int verbose = FALSE;     /* verbose file output */
+    haddr_t root_tag;
+    haddr_t sbe_tag;
+    haddr_t g_tag;
+
+    /* Testing Macro */
+    TESTING("tag application during group open");
+ 
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create a test file with provided fcpl_t */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Create group */
+    if ( (gid = H5Gcreate(fid, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve group tag */
+    if ( get_new_object_header_tag(fid, &g_tag) < 0 ) TEST_ERROR;
+
+    /* Close Group */
+    if (H5Gclose(gid) < 0) TEST_ERROR;
+
+    /* Close and Reopen the file */
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* ================ */
+    /* TEST: Open Group */
+    /* ================ */
+
+    if ( (gid = H5Gopen2(fid, GROUPNAME, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* Verify root group metadata */
+    if ( verify_tag(fid, H5AC_OHDR_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_SNODE_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_LHEAP_PRFX_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT_ID, root_tag) < 0 ) TEST_ERROR;
+
+    /* Verify opened group metadata */
+    if ( verify_tag(fid, H5AC_OHDR_ID, g_tag) < 0 ) TEST_ERROR;
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Gclose(gid) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_group_open_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_attribute_creation_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during attribute creation.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              February 24, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_attribute_creation_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;          /* File Identifier */
+    hid_t aid = -1;          /* Attribute Identifier */
+    hid_t gid = -1;          /* Group Identifier */
+    hid_t sid = -1;          /* Dataspace Identifier */
+    int verbose = FALSE;     /* verbose file outout */
+    haddr_t root_tag = 0;   /* Root group tag */
+    haddr_t sbe_tag = 0;
+    haddr_t g_tag = 0;
+    hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */
+    hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */
+
+    /* Testing Macro */
+    TESTING("tag application during attribute creation");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create a test file with provided fcpl_t */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Create group */
+    if ( (gid = H5Gcreate(fid, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve group tag */
+    if ( get_new_object_header_tag(fid, &g_tag) < 0 ) TEST_ERROR;
+
+    /* Close and Reopen the file and group */
+    if ( H5Gclose(gid) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+    if ( (gid = H5Gopen2(fid, GROUPNAME, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* ========================= */
+    /* Create Attribute on Group */
+    /* ========================= */
+
+    if ( (sid = H5Screate_simple(2, dims1, maxdims)) < 0 ) TEST_ERROR;
+
+    if ( (aid = H5Acreate2(gid, ATTRNAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* verify object header belonging to group */
+    if ( verify_tag(fid, H5AC_OHDR_ID, g_tag) < 0 ) TEST_ERROR;
+
+    /* verify object header chunk belonging to group */
+    if ( verify_tag(fid, H5AC_OHDR_CHK_ID, g_tag) < 0 ) TEST_ERROR;
+
+    if ( type == TEST_SHMESG ) {
+
+        /* verify (another) object header chunk belonging to group */
+        if ( verify_tag(fid, H5AC_OHDR_CHK_ID, g_tag) < 0 ) TEST_ERROR;
+
+        /* verify shared message index tagged with sohm */
+        if ( verify_tag(fid, H5AC_SOHM_LIST_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+        if ( verify_tag(fid, H5AC_SOHM_TABLE_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+        
+        /* verify fractal heap header belonging to group */
+        if ( verify_tag(fid, H5AC_FHEAP_HDR_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+
+        /* verify fractal heap direct block belonging to group */
+        if ( verify_tag(fid, H5AC_FHEAP_DBLOCK_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+
+        /* Verify free space header and free space section */
+        if ( verify_tag(fid, H5AC_FSPACE_HDR_ID, H5AC__FREESPACE_TAG) < 0 ) TEST_ERROR;
+        if ( verify_tag(fid, H5AC_FSPACE_SINFO_ID, H5AC__FREESPACE_TAG) < 0 ) TEST_ERROR;
+
+        /* verify btree header and leaf node belonging to group */
+        if ( verify_tag(fid, H5AC_BT2_HDR_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+        if ( verify_tag(fid, H5AC_BT2_LEAF_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+    
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Aclose(aid) < 0 ) TEST_ERROR;
+    if ( H5Gclose(gid) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_attribute_creation_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_attribute_open_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during attribute open.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              February 24, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_attribute_open_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;          /* File Identifier */
+    hid_t aid = -1;          /* Attribute Identifier */
+    hid_t gid = -1;          /* Group Identifier */
+    hid_t sid = -1;          /* Dataspace Identifier */
+    int verbose = FALSE;     /* verbose file outout */
+    haddr_t root_tag = 0;
+    haddr_t sbe_tag = 0;
+    haddr_t g_tag = 0;
+    hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */
+    hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */
+
+    /* Testing Macro */
+    TESTING("tag application during attribute open");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create a test file with provided fcpl_t */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Create group */
+    if ( (gid = H5Gcreate(fid, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve group tag */
+    if ( get_new_object_header_tag(fid, &g_tag) < 0 ) TEST_ERROR;
+
+    /* Create attribute dataspace */
+    if ( (sid = H5Screate_simple(2, dims1, maxdims)) < 0 ) TEST_ERROR;
+
+    /* Create attribute on group */
+    if ( (aid = H5Acreate2(gid, ATTRNAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Close attribute */
+    if ( H5Aclose(aid) < 0 ) TEST_ERROR;
+
+    /* Close and Reopen the file and group */
+    if ( H5Gclose(gid) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+    if ( (gid = H5Gopen2(fid, GROUPNAME, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* ========================= */
+    /* Open Attribute of Group */
+    /* ========================= */
+
+    if ( (aid = H5Aopen(gid, ATTRNAME, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* verify object header belonging to group */
+    if ( verify_tag(fid, H5AC_OHDR_ID, g_tag) < 0 ) TEST_ERROR;
+
+    /* verify object header chunk belonging to group */
+    if ( verify_tag(fid, H5AC_OHDR_CHK_ID, g_tag) < 0 ) TEST_ERROR;
+   
+    if ( type == TEST_SHMESG ) {
+
+        /* verify (another) object header chunk belonging to group */
+        if ( verify_tag(fid, H5AC_OHDR_CHK_ID, g_tag) < 0 ) TEST_ERROR;
+
+        /* verify shared header message master table */
+        if ( verify_tag(fid, H5AC_SOHM_TABLE_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+
+        /* verify fractal heap header belonging to group */
+        if ( verify_tag(fid, H5AC_FHEAP_HDR_ID, g_tag) < 0 ) TEST_ERROR;
+
+        /* verify fractal heap direct block belonging to group */
+        if ( verify_tag(fid, H5AC_FHEAP_DBLOCK_ID, g_tag) < 0 ) TEST_ERROR;
+
+        /* verify btree header and leaf node belonging to group */
+        if ( verify_tag(fid, H5AC_BT2_HDR_ID, g_tag) < 0 ) TEST_ERROR;
+        if ( verify_tag(fid, H5AC_BT2_LEAF_ID, g_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Aclose(aid) < 0 ) TEST_ERROR;
+    if ( H5Gclose(gid) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_attribute_open_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_attribute_rename_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during attribute renaming.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              March 3, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_attribute_rename_tags(hid_t fcpl, int type)
+{
+    /* Variable declarations */
+    hid_t fid = -1;                         /* File Identifier */
+    hid_t gid = -1;                         /* Group Identifier */
+    hid_t aid = -1;                         /* Attribute Identifier */
+    hid_t sid = -1;                         /* Dataset Identifier */
+    int verbose = FALSE;                    /* verbose file outout */
+    int data[DIMS][DIMS];                   /* data buffer */
+    int i,j,k = 0;                           /* iterators */
+    haddr_t root_tag = 0;
+    haddr_t sbe_tag = 0;
+    haddr_t g_tag = 0;
+    hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */
+    hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */
+
+    /* Testing Macro */
+    TESTING("tag application during attribute renaming");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create a test file with provided fcpl_t */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Create group */
+    if ( (gid = H5Gcreate(fid, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve group tag */
+    if ( get_new_object_header_tag(fid, &g_tag) < 0 ) TEST_ERROR;
+
+    /* Set up attribute dataspace */
+    if ( (sid = H5Screate_simple(2, dims1, maxdims)) < 0 ) TEST_ERROR;
+
+    /* Create attribute */
+    if ( (aid = H5Acreate2(gid, ATTRNAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+ 
+    /* fill out data buffer */
+    for(i=0;i<DIMS;i++) {
+        for(j=0;j<DIMS;j++) {
+
+            data[i][j] = k++;
+        } /* end for */
+    } /* end for */
+
+    /* Write to attribute */
+    if ( H5Awrite(aid, H5T_NATIVE_INT, data) < 0 ) TEST_ERROR;
+
+    /* Close Attribute */
+    if ( H5Aclose(aid) < 0 ) TEST_ERROR;
+
+    /* Close and Reopen the file and group */
+    if ( H5Gclose(gid) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+    if ( (gid = H5Gopen2(fid, GROUPNAME, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* ========================= */
+    /* Rename Attribute of Group */
+    /* ========================= */
+
+    if ( H5Arename_by_name(fid, GROUPNAME, ATTRNAME, ATTRNAME3, H5P_DEFAULT) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* Verify root group metadata */
+    if ( verify_tag(fid, H5AC_OHDR_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_SNODE_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_LHEAP_PRFX_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT_ID, root_tag) < 0 ) TEST_ERROR;
+
+    /* verify object header belonging to group */
+    if ( verify_tag(fid, H5AC_OHDR_ID, g_tag) < 0 ) TEST_ERROR;
+
+    /* verify object header chunk belonging to group */
+    if ( verify_tag(fid, H5AC_OHDR_CHK_ID, g_tag) < 0 ) TEST_ERROR;
+
+    if ( type == TEST_SHMESG ) {
+
+        /* verify (another) object header chunk belonging to group */
+        if ( verify_tag(fid, H5AC_OHDR_CHK_ID, g_tag) < 0 ) TEST_ERROR;
+
+        /* verify shared header message master table */
+        if ( verify_tag(fid, H5AC_SOHM_TABLE_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+
+        /* verify fractal heap header belonging to group */
+        if ( verify_tag(fid, H5AC_FHEAP_HDR_ID, g_tag) < 0 ) TEST_ERROR;
+
+        /* verify fractal heap direct block belonging to group */
+        if ( verify_tag(fid, H5AC_FHEAP_DBLOCK_ID, g_tag) < 0 ) TEST_ERROR;
+
+        /* verify shared header message stored as a list */
+        if ( verify_tag(fid, H5AC_SOHM_LIST_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+
+        /* verify free space header */
+        if ( verify_tag(fid, H5AC_FSPACE_HDR_ID, H5AC__FREESPACE_TAG) < 0 ) TEST_ERROR;
+
+        /* verify btree header and leaf node belonging to group */
+        if ( verify_tag(fid, H5AC_BT2_HDR_ID, g_tag) < 0 ) TEST_ERROR;
+        if ( verify_tag(fid, H5AC_BT2_LEAF_ID, g_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Gclose(gid) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_attribute_rename_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_attribute_delete_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during attribute deletion.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              March 3, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_attribute_delete_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;                         /* File Identifier */
+    hid_t gid = -1;                         /* Group Identifier */
+    hid_t aid = -1;                         /* Attribute Identifier */
+    hid_t sid = -1;                         /* Dataset Identifier */
+    int verbose = FALSE;                    /* verbose file outout */
+    int data[DIMS][DIMS];                   /* data buffer */
+    int i,j,k = 0;                           /* iterators */
+    haddr_t root_tag = 0;
+    haddr_t sbe_tag = 0;
+    haddr_t g_tag = 0;
+    hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */
+    hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */
+
+    /* Testing Macro */
+    TESTING("tag application during attribute delete");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create a test file with provided fcpl_t */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Create group */
+    if ( (gid = H5Gcreate(fid, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve group tag */
+    if ( get_new_object_header_tag(fid, &g_tag) < 0 ) TEST_ERROR;
+
+    /* Set up attribute dataspace */
+    if ( (sid = H5Screate_simple(2, dims1, maxdims)) < 0 ) TEST_ERROR;
+
+    /* Create attribute */
+    if ( (aid = H5Acreate2(gid, ATTRNAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+ 
+    /* fill out data buffer */
+    for(i=0;i<DIMS;i++) {
+        for(j=0;j<DIMS;j++) {
+
+            data[i][j] = k++;
+        } /* end for */
+    } /* end for */
+
+    /* Write to attribute */
+    if ( (H5Awrite(aid, H5T_NATIVE_INT, data)) < 0 ) TEST_ERROR;
+
+    /* Close Attribute */
+    if ( H5Aclose(aid) < 0 ) TEST_ERROR;
+
+    /* Close and Reopen the file and group */
+    if ( H5Gclose(gid) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+    if ( (gid = H5Gopen2(fid, GROUPNAME, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* ========================= */
+    /* Delete Attribute of Group */
+    /* ========================= */
+
+    if ( (H5Adelete(gid, ATTRNAME)) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* verify object header belonging to group */
+    if ( verify_tag(fid, H5AC_OHDR_ID, g_tag) < 0 ) TEST_ERROR;
+   
+    if ( type == TEST_SHMESG ) {
+
+        /* verify shared header message master table */
+        if ( verify_tag(fid, H5AC_SOHM_TABLE_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+
+        /* verify free space */
+        if ( verify_tag(fid, H5AC_FSPACE_HDR_ID, H5AC__FREESPACE_TAG) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Gclose(gid) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_attribute_delete_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_dataset_creation_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during dataset creation.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              February 10, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_dataset_creation_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;                         /* File Identifier */
+    hid_t did = -1;                         /* Dataset Identifier */
+    hid_t sid = -1;                         /* Dataspace Identifier */
+    int verbose = FALSE;                    /* verbose file outout */
+    hid_t dcpl = -1;                        /* dataset creation pl */
+    hsize_t cdims[2] = {1,1};               /* chunk dimensions */
+    int fillval = 0;
+    haddr_t root_tag = 0;
+    haddr_t sbe_tag = 0;
+    haddr_t d_tag = 0;
+    hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */
+    hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */
+
+    /* Testing Macro */
+    TESTING("tag application during dataset creation");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Close and Reopen the file */
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* ============================ */
+    /* Create Dataset in Root Group */
+    /* ============================ */
+ 
+    /* Set up creation property list */
+    dcpl = H5Pcreate(H5P_DATASET_CREATE);
+    
+    /* Enable chunking */
+    if ( H5Pset_chunk(dcpl, RANK, cdims) < 0 ) TEST_ERROR;
+
+    /* Set up a fill value */
+    if ( H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillval) < 0 ) TEST_ERROR;
+
+    /* Set up dataset dataspace */
+    if ( (sid = H5Screate_simple(2, dims1, maxdims)) < 0 ) TEST_ERROR;
+
+    /* Create Dataset */
+    if (( did = H5Dcreate2(fid, DATASETNAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* Verify root group metadata */
+    if ( verify_tag(fid, H5AC_OHDR_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_SNODE_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_LHEAP_PRFX_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT_ID, root_tag) < 0 ) TEST_ERROR;
+
+    /* Get dataset's object header address */
+    if ( get_new_object_header_tag(fid, &d_tag) < 0 ) TEST_ERROR;
+
+    if ( type == TEST_SHMESG ) {
+
+        /* verify shared header message master table */
+        if ( verify_tag(fid, H5AC_SOHM_TABLE_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+
+        /* Verify dataset's tagged metadata */
+        if ( verify_tag(fid, H5AC_FHEAP_HDR_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+        
+        /* Verify shared object header message tags */
+        if ( verify_tag(fid, H5AC_SOHM_LIST_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Dclose(did) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_dataset_creation_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_dataset_creation_earlyalloc_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during dataset creation.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              March 1, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_dataset_creation_earlyalloc_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;                         /* File Identifier */
+    hid_t did = -1;                         /* Dataset Identifier */
+    hid_t sid = -1;                         /* Dataspace Identifier */
+    int verbose = FALSE;                    /* verbose file outout */
+    hid_t dcpl = -1;                        /* dataset creation pl */
+    hsize_t cdims[2] = {1,1};               /* chunk dimensions */
+    int fillval = 0;
+    haddr_t root_tag = 0;
+    haddr_t sbe_tag = 0;
+    haddr_t d_tag = 0;
+    hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */
+    hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */
+    int i = 0;           /* iterator */
+
+    /* Testing Macro */
+    TESTING("tag application during dataset creation with early allocation");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Close and Reopen the file */
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* ============================ */
+    /* Create Dataset in Root Group */
+    /* ============================ */
+
+    dcpl = H5Pcreate(H5P_DATASET_CREATE);
+
+    if ( H5Pset_chunk(dcpl, RANK, cdims) < 0 ) TEST_ERROR;
+
+    if ( H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillval) < 0 ) TEST_ERROR;
+
+    /* Set early allocation time */
+    if ( H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0 ) TEST_ERROR;
+
+    /* Set up dataset dataspace */
+    if ( (sid = H5Screate_simple(2, dims1, maxdims)) < 0 ) TEST_ERROR;
+
+    if (( did = H5Dcreate2(fid, DATASETNAME2, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* Verify root group metadata */
+    if ( verify_tag(fid, H5AC_OHDR_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_SNODE_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_LHEAP_PRFX_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT_ID, root_tag) < 0 ) TEST_ERROR;
+
+    /* Get dataset's object header address */
+    if ( get_new_object_header_tag(fid, &d_tag) < 0 ) TEST_ERROR;
+
+    if ( type == TEST_SHMESG ) {
+
+        /* verify shared header message master table */
+        if ( verify_tag(fid, H5AC_SOHM_TABLE_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+
+        /* Verify dataset's tagged metadata */
+        if ( verify_tag(fid, H5AC_FHEAP_HDR_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+        
+        /* Verify shared object header message tags */
+        if ( verify_tag(fid, H5AC_SOHM_LIST_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Verify 19 b-tree nodes belonging to dataset  */
+    for (i=0; i<19; i++)
+        if ( verify_tag(fid, H5AC_BT_ID, d_tag) < 0 ) TEST_ERROR;
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Dclose(did) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_dataset_creation_earlyalloc_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_dataset_open_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during dataset open.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              February 10, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_dataset_open_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;                         /* File Identifier */
+    hid_t did = -1;                         /* Dataset Identifier */
+    hid_t sid = -1;                         /* Dataspace Identifier */
+    int verbose = FALSE;                    /* verbose file outout */
+    hid_t dcpl = -1;                        /* dataset creation pl */
+    hsize_t cdims[2] = {1,1};               /* chunk dimensions */
+    int fillval = 0;
+    haddr_t root_tag = 0;
+    haddr_t sbe_tag = 0;
+    haddr_t d_tag = 0;
+    hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */
+    hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */
+
+    /* Testing Macro */
+    TESTING("tag application during dataset open");
+
+    /* ========= */
+    /* Open File */
+    /* ========= */
+
+    /* Create file */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Set up creation property list */
+    dcpl = H5Pcreate(H5P_DATASET_CREATE);
+    
+    /* Enable chunking */
+    if ( H5Pset_chunk(dcpl, RANK, cdims) < 0 ) TEST_ERROR;
+
+    /* Set up a fill value */
+    if ( H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillval) < 0 ) TEST_ERROR;
+
+    /* Set up dataset dataspace */
+    if ( (sid = H5Screate_simple(2, dims1, maxdims)) < 0 ) TEST_ERROR;
+
+    /* Create Dataset */
+    if (( did = H5Dcreate2(fid, DATASETNAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve tag associated with this dataset */
+    if ( get_new_object_header_tag(fid, &d_tag) < 0 ) TEST_ERROR;
+
+    /* Close Dataset */
+    if (H5Dclose(did) < 0 ) TEST_ERROR;
+
+    /* Close and Reopen the file */
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* ========================== */
+    /* Open Dataset in Root Group */
+    /* ========================== */
+ 
+    if (( did = H5Dopen2(fid, DATASETNAME, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* Verify root group metadata */
+    if ( verify_tag(fid, H5AC_OHDR_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_SNODE_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_LHEAP_PRFX_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT_ID, root_tag) < 0 ) TEST_ERROR;
+
+    /* Verify dataset's object header */
+    if ( verify_tag(fid, H5AC_OHDR_ID, d_tag) < 0 ) TEST_ERROR;
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Dclose(did) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_dataset_open_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_dataset_write_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during dataset write.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              February 10, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_dataset_write_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;                         /* File Identifier */
+    hid_t did = -1;                         /* Dataset Identifier */
+    hid_t sid = -1;                         /* Dataspace Identifier */
+    int verbose = FALSE;                    /* verbose file outout */
+    hid_t dcpl = -1;                        /* dataset creation pl */
+    hsize_t cdims[2] = {1,1};               /* chunk dimensions */
+    int fillval = 0;
+    haddr_t root_tag = 0;
+    haddr_t sbe_tag = 0;
+    haddr_t d_tag = 0;
+    hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */
+    hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */
+    int i,j,k = 0;           /* iterators */
+    int data[DIMS][DIMS];
+
+    /* Testing Macro */
+    TESTING("tag application during dataset write");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create file */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Set up creation property list */
+    dcpl = H5Pcreate(H5P_DATASET_CREATE);
+    
+    /* Enable chunking */
+    if ( H5Pset_chunk(dcpl, RANK, cdims) < 0 ) TEST_ERROR;
+
+    /* Set up a fill value */
+    if ( H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillval) < 0 ) TEST_ERROR;
+
+    /* Set up dataset dataspace */
+    if ( (sid = H5Screate_simple(2, dims1, maxdims)) < 0 ) TEST_ERROR;
+
+    /* Create Dataset */
+    if (( did = H5Dcreate2(fid, DATASETNAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve tag associated with this dataset */
+    if ( get_new_object_header_tag(fid, &d_tag) < 0 ) TEST_ERROR;
+
+    /* Close and Reopen the file and dataset */
+    if ( H5Dclose(did) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+    if (( did = H5Dopen2(fid, DATASETNAME, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* ============================== */
+    /* Write to Dataset in Root Group */
+    /* ============================== */
+
+    /* fill out data buffer */
+    for(i=0;i<DIMS;i++) {
+        for(j=0;j<DIMS;j++) {
+
+            data[i][j] = k++;
+        } /* end for */
+    } /* end for */
+
+    /* Write to dataset */
+    if( (H5Dwrite(did, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, data)) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+ 
+    /* Verify 10 b-tree nodes belonging to dataset  */
+    for (i=0; i<10; i++)
+        if ( verify_tag(fid, H5AC_BT_ID, d_tag) < 0 ) TEST_ERROR;
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Dclose(did) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_dataset_write_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_attribute_write_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during attribute write.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              March 3, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_attribute_write_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;                         /* File Identifier */
+    hid_t gid = -1;                         /* Group Identifier */
+    hid_t aid = -1;                         /* Attribute Identifier */
+    hid_t sid = -1;                         /* Dataset Identifier */
+    int verbose = FALSE;                    /* verbose file outout */
+    int data[DIMS][DIMS];                   /* data buffer */
+    int i,j,k = 0;                           /* iterators */
+    haddr_t root_tag = 0;
+    haddr_t sbe_tag = 0;
+    haddr_t g_tag = 0;
+    hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */
+    hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */
+
+    /* Testing Macro */
+    TESTING("tag application during attribute write");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create a test file with provided fcpl_t */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Create group */
+    if ( (gid = H5Gcreate(fid, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve group tag */
+    if ( get_new_object_header_tag(fid, &g_tag) < 0 ) TEST_ERROR;
+
+    /* Create attribute dataspace */
+    if ( (sid = H5Screate_simple(2, dims1, maxdims)) < 0 ) TEST_ERROR;
+
+    /* Create attribute on group */
+    if ( (aid = H5Acreate2(gid, ATTRNAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Close and Reopen the file, group, and attribute */
+    if ( H5Aclose(aid) < 0 ) TEST_ERROR;
+    if ( H5Gclose(gid) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+    if ( (gid = H5Gopen2(fid, GROUPNAME, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+    if ( (aid = H5Aopen(gid, ATTRNAME, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Write to Attribute in Group */
+    /* =========================== */
+
+    /* fill out data buffer */
+    for(i=0;i<DIMS;i++) {
+        for(j=0;j<DIMS;j++) {
+
+            data[i][j] = k++;
+        } /* end for */
+    } /* end for */
+
+    /* Write attribute */
+    if ( (H5Awrite(aid, H5T_NATIVE_INT, data)) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+ 
+    /* Verify object header of group */
+    if ( verify_tag(fid, H5AC_OHDR_ID, g_tag) < 0 ) TEST_ERROR;
+
+    /* verify object header chunk belonging to group */
+    if ( verify_tag(fid, H5AC_OHDR_CHK_ID, g_tag) < 0 ) TEST_ERROR;
+
+    if ( type == TEST_SHMESG ) {
+
+        /* verify (another) object header chunk belonging to group */
+        if ( verify_tag(fid, H5AC_OHDR_CHK_ID, g_tag) < 0 ) TEST_ERROR;
+
+        /* verify shared header message master table and list */
+        if ( verify_tag(fid, H5AC_SOHM_TABLE_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+
+        /* verify fractal heap header belonging to group */
+        if ( verify_tag(fid, H5AC_FHEAP_HDR_ID, g_tag) < 0 ) TEST_ERROR;
+
+        /* verify fractal heap direct block belonging to group */
+        if ( verify_tag(fid, H5AC_FHEAP_DBLOCK_ID, g_tag) < 0 ) TEST_ERROR;
+
+        /* Verify SOHM list */
+        if ( verify_tag(fid, H5AC_SOHM_LIST_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+
+        /* verify btree header and leaf node belonging to group */
+        if ( verify_tag(fid, H5AC_BT2_HDR_ID, g_tag) < 0 ) TEST_ERROR;
+        if ( verify_tag(fid, H5AC_BT2_LEAF_ID, g_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Aclose(aid) < 0 ) TEST_ERROR;
+    if ( H5Gclose(gid) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_attribute_write_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_dataset_read_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during dataset read.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              February 10, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_dataset_read_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;                         /* File Identifier */
+    hid_t did = -1;                         /* Dataset Identifier */
+    hid_t sid = -1;                         /* Dataspace Identifier */
+    int verbose = FALSE;                    /* verbose file outout */
+    hid_t dcpl = -1;                        /* dataset creation pl */
+    hsize_t cdims[2] = {1,1};               /* chunk dimensions */
+    int fillval = 0;
+    haddr_t root_tag = 0;
+    haddr_t sbe_tag = 0;
+    haddr_t d_tag = 0;
+    hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */
+    hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */
+    int i,j,k = 0;           /* iterators */
+    int data[DIMS][DIMS];
+
+    /* Testing Macro */
+    TESTING("tag application during dataset read");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create file */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Set up creation property list */
+    dcpl = H5Pcreate(H5P_DATASET_CREATE);
+    
+    /* Enable chunking */
+    if ( H5Pset_chunk(dcpl, RANK, cdims) < 0 ) TEST_ERROR;
+
+    /* Set up a fill value */
+    if ( H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillval) < 0 ) TEST_ERROR;
+
+    /* Set up dataset dataspace */
+    if ( (sid = H5Screate_simple(2, dims1, maxdims)) < 0 ) TEST_ERROR;
+
+    /* Create Dataset */
+    if (( did = H5Dcreate2(fid, DATASETNAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve tag associated with this dataset */
+    if ( get_new_object_header_tag(fid, &d_tag) < 0 ) TEST_ERROR;
+
+    /* fill out data buffer */
+    for(i=0;i<DIMS;i++) {
+        for(j=0;j<DIMS;j++) {
+
+            data[i][j] = k++;
+        } /* end for */
+    } /* end for */
+
+    /* Write to dataset */
+    if( (H5Dwrite(did, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, data)) < 0 ) TEST_ERROR;
+
+    /* Close and Reopen the file and dataset */
+    if ( H5Dclose(did) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+    if (( did = H5Dopen2(fid, DATASETNAME, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* ===================================== */
+    /* TEST: Read from Dataset in Root Group */
+    /* ===================================== */
+
+    if( (H5Dread(did, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, data)) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+ 
+    /* Verify 19 b-tree nodes belonging to dataset  */
+    for (i=0; i<19; i++)
+        if ( verify_tag(fid, H5AC_BT_ID, d_tag) < 0 ) TEST_ERROR;
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Dclose(did) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_dataset_read_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_dataset_size_retrieval
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during dataset size retrieval.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              February 24, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_dataset_size_retrieval(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;                         /* File Identifier */
+    hid_t did = -1;                         /* Dataset Identifier */
+    hid_t sid = -1;                         /* Dataspace Identifier */
+    int verbose = FALSE;                    /* verbose file outout */
+    hid_t dcpl = -1;                        /* dataset creation pl */
+    hsize_t cdims[2] = {1,1};               /* chunk dimensions */
+    int fillval = 0;
+    haddr_t root_tag = 0;
+    haddr_t sbe_tag = 0;
+    haddr_t d_tag = 0;
+    hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */
+    hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */
+    int i,j,k = 0;           /* iterators */
+    int data[DIMS][DIMS];
+    hsize_t dsize = 0;
+
+    /* Testing Macro */
+    TESTING("tag application during dataset storage size retrieval");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create file */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Set up creation property list */
+    dcpl = H5Pcreate(H5P_DATASET_CREATE);
+    
+    /* Enable chunking */
+    if ( H5Pset_chunk(dcpl, RANK, cdims) < 0 ) TEST_ERROR;
+
+    /* Set up a fill value */
+    if ( H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillval) < 0 ) TEST_ERROR;
+
+    /* Set up dataset dataspace */
+    if ( (sid = H5Screate_simple(2, dims1, maxdims)) < 0 ) TEST_ERROR;
+
+    /* Create Dataset */
+    if (( did = H5Dcreate2(fid, DATASETNAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve tag associated with this dataset */
+    if ( get_new_object_header_tag(fid, &d_tag) < 0 ) TEST_ERROR;
+
+    /* fill out data buffer */
+    for(i=0;i<DIMS;i++) {
+        for(j=0;j<DIMS;j++) {
+
+            data[i][j] = k++;
+        } /* end for */
+    } /* end for */
+
+    /* Write to dataset */
+    if( (H5Dwrite(did, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, data)) < 0 ) TEST_ERROR;
+
+    /* Close and Reopen the file and dataset */
+    if ( H5Dclose(did) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+    if (( did = H5Dopen2(fid, DATASETNAME, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================= */
+    /* Get storage size of dataset in Root Group */
+    /* ========================================= */
+
+    if ( (dsize = H5Dget_storage_size(did)) == 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* Verify 19 b-tree nodes belonging to dataset  */
+    for (i=0; i<19; i++)
+        if ( verify_tag(fid, H5AC_BT_ID, d_tag) < 0 ) TEST_ERROR;
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Dclose(did) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_dataset_size_retrieval */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_dataset_extend_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during dataset extension.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              February 24, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_dataset_extend_tags(hid_t fcpl, int type)
+{
+
+    /* Variable Declarations */
+    hid_t fid = -1;                         /* File Identifier */
+    hid_t did = -1;                         /* Dataset Identifier */
+    hid_t sid = -1;                         /* Dataspace Identifier */
+    int verbose = FALSE;                    /* verbose file outout */
+    hid_t dcpl = -1;                        /* dataset creation pl */
+    hsize_t cdims[2] = {1,1};               /* chunk dimensions */
+    int fillval = 0;
+    haddr_t root_tag = 0;
+    haddr_t sbe_tag = 0;
+    haddr_t d_tag = 0;
+    hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */
+    hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */
+    int i,j,k = 0;           /* iterators */
+    int data[DIMS][DIMS];
+    hsize_t newdims[2] = {DIMS*2, DIMS};  /* dimensions */
+
+    /* Testing Macro */
+    TESTING("tag application during dataset extend");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create file */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Set up creation property list */
+    dcpl = H5Pcreate(H5P_DATASET_CREATE);
+    
+    /* Enable chunking */
+    if ( H5Pset_chunk(dcpl, RANK, cdims) < 0 ) TEST_ERROR;
+
+    /* Set up a fill value */
+    if ( H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillval) < 0 ) TEST_ERROR;
+
+    /* Set up dataset dataspace */
+    if ( (sid = H5Screate_simple(2, dims1, maxdims)) < 0 ) TEST_ERROR;
+
+    /* Create Dataset */
+    if (( did = H5Dcreate2(fid, DATASETNAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve tag associated with this dataset */
+    if ( get_new_object_header_tag(fid, &d_tag) < 0 ) TEST_ERROR;
+
+    /* fill out data buffer */
+    for(i=0;i<DIMS;i++) {
+        for(j=0;j<DIMS;j++) {
+
+            data[i][j] = k++;
+        } /* end for */
+    } /* end for */
+
+    /* Write to dataset */
+    if( (H5Dwrite(did, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, data)) < 0 ) TEST_ERROR;
+
+    /* Close and Reopen the file and dataset */
+    if ( H5Dclose(did) < 0 ) TEST_ERROR;
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+    if (( did = H5Dopen2(fid, DATASETNAME, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* ================== */
+    /* Set Dataset extent */
+    /* ================== */
+
+    if ( H5Dset_extent(did, newdims) < 0 ) TEST_ERROR;
+
+    if ( H5Dclose(did) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* Verify root group metadata */
+    if ( verify_tag(fid, H5AC_OHDR_ID, d_tag) < 0 ) TEST_ERROR;
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_dataset_extend_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_object_info_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during object information retrieval.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              March 1, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_object_info_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;          /* File Identifier */
+    hid_t gid = -1;          /* Group Identifier */
+    int verbose = FALSE;     /* verbose file output */
+    haddr_t root_tag;
+    haddr_t sbe_tag;
+    haddr_t g_tag;
+    H5O_info_t oinfo;                       /* Object info struct */    
+
+    /* Testing Macro */
+    TESTING("tag application during object info retrieval");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create a test file with provided fcpl_t */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Create group */
+    if ( (gid = H5Gcreate(fid, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve group tag */
+    if ( get_new_object_header_tag(fid, &g_tag) < 0 ) TEST_ERROR;
+
+    /* Close Group */
+    if (H5Gclose(gid) < 0) TEST_ERROR;
+
+    /* Close and Reopen the file */
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* ===================================== */
+    /* Get information on an object by name  */
+    /* ===================================== */
+
+    if ( H5Oget_info_by_name(fid, GROUPNAME, &oinfo, H5P_DEFAULT) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* Verify root group's tagged metadata */
+    if ( verify_tag(fid, H5AC_OHDR_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_SNODE_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_LHEAP_PRFX_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT_ID, root_tag) < 0 ) TEST_ERROR;
+
+    /* Verify dataset's tagged metadata */
+    if ( verify_tag(fid, H5AC_OHDR_ID, g_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT_ID, g_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_LHEAP_PRFX_ID, g_tag) < 0 ) TEST_ERROR;
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_object_info_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_object_copy_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during object copy.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              March 3, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_object_copy_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;                         /* File Identifier */
+    hid_t gid = -1;                         /* Group Identifier */
+    int verbose = FALSE;     /* verbose file output */
+    haddr_t root_tag;
+    haddr_t sbe_tag;
+    haddr_t g_tag;
+    haddr_t copy_tag;
+
+    /* Testing Macro */
+    TESTING("tag application during object copy");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create a test file with provided fcpl_t */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Create group */
+    if ( (gid = H5Gcreate(fid, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve group tag */
+    if ( get_new_object_header_tag(fid, &g_tag) < 0 ) TEST_ERROR;
+
+    /* Close Group */
+    if (H5Gclose(gid) < 0) TEST_ERROR;
+
+    /* Close and Reopen the file */
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* =========== */
+    /* Copy Group */
+    /* =========== */
+
+    H5Ocopy(fid, GROUPNAME, fid, GROUPNAMECOPY, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* Verify root group's tagged metadata */
+    if ( verify_tag(fid, H5AC_OHDR_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_SNODE_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_LHEAP_PRFX_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT_ID, root_tag) < 0 ) TEST_ERROR;
+
+    /* Verify dataset's tagged metadata */
+    if ( verify_tag(fid, H5AC_OHDR_ID, g_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT_ID, g_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_LHEAP_PRFX_ID, g_tag) < 0 ) TEST_ERROR;
+
+    /* Verify copied dataset's tagged metadata */
+    if ( get_new_object_header_tag(fid, &copy_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT_ID, copy_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_LHEAP_PRFX_ID, copy_tag) < 0 ) TEST_ERROR;
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_object_copy_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_link_removal_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during link removal.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              March 1, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_link_removal_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;                         /* File Identifier */
+    hid_t did = -1;                         /* Dataset Identifier */
+    hid_t sid = -1;                         /* Dataspace Identifier */
+    hid_t gid = -1;                         /* Dataspace Identifier */
+    int verbose = FALSE;                    /* verbose file outout */
+    hid_t dcpl = -1;                        /* dataset creation pl */
+    hsize_t cdims[2] = {1,1};               /* chunk dimensions */
+    int fillval = 0;
+    haddr_t root_tag = 0;
+    haddr_t sbe_tag = 0;
+    haddr_t d_tag = 0;
+    haddr_t g_tag = 0;
+    hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */
+    hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */
+    int i,j,k = 0;           /* iterators */
+    int data[DIMS][DIMS];
+
+    /* Testing Macro */
+    TESTING("tag application during link removal");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create file */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Create group */
+    if ( (gid = H5Gcreate(fid, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve group tag */
+    if ( get_new_object_header_tag(fid, &g_tag) < 0 ) TEST_ERROR;
+
+    /* Close Group */
+    if (H5Gclose(gid) < 0) TEST_ERROR;
+
+    /* Set up creation property list */
+    dcpl = H5Pcreate(H5P_DATASET_CREATE);
+    
+    /* Enable chunking */
+    if ( H5Pset_chunk(dcpl, RANK, cdims) < 0 ) TEST_ERROR;
+
+    /* Set up a fill value */
+    if ( H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillval) < 0 ) TEST_ERROR;
+
+    /* Set up dataset dataspace */
+    if ( (sid = H5Screate_simple(2, dims1, maxdims)) < 0 ) TEST_ERROR;
+
+    /* Create Dataset */
+    if (( did = H5Dcreate2(fid, DATASETNAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve tag associated with this dataset */
+    if ( get_new_object_header_tag(fid, &d_tag) < 0 ) TEST_ERROR;
+
+    /* fill out data buffer */
+    for(i=0;i<DIMS;i++) {
+        for(j=0;j<DIMS;j++) {
+
+            data[i][j] = k++;
+        } /* end for */
+    } /* end for */
+
+    /* Write to dataset */
+    if( (H5Dwrite(did, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, data)) < 0 ) TEST_ERROR;
+
+    /* Close Dataset */
+    if ( H5Dclose(did) < 0 ) TEST_ERROR;
+
+    /* Close and Reopen the file and dataset */
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* ================================ */
+    /* Remove link to group and dataset */
+    /* ================================ */
+
+    if ( (H5Ldelete(fid, GROUPNAME, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    if ( (H5Ldelete(fid, DATASETNAME, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* Verify root group's tagged metadata */
+    if ( verify_tag(fid, H5AC_OHDR_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_LHEAP_PRFX_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT_ID, root_tag) < 0 ) TEST_ERROR;
+
+    if ( type == TEST_SHMESG ) {
+
+        /* verify shared header message master table */
+        if ( verify_tag(fid, H5AC_SOHM_TABLE_ID, H5AC__SOHM_TAG) < 0 ) TEST_ERROR;
+
+    } /* end if */
+    
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_link_removal_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_link_getname_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during link name retrieval.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              March 2, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_link_getname_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    char name[500];
+    hid_t fid = -1;                         /* File Identifier */
+    hid_t did = -1;                         /* Dataset Identifier */
+    hid_t sid = -1;                         /* Dataspace Identifier */
+    hid_t gid = -1;                         /* Dataspace Identifier */
+    int verbose = FALSE;                    /* verbose file outout */
+    hid_t dcpl = -1;                        /* dataset creation pl */
+    hsize_t cdims[2] = {1,1};               /* chunk dimensions */
+    int fillval = 0;
+    haddr_t root_tag = 0;
+    haddr_t sbe_tag = 0;
+    haddr_t d_tag = 0;
+    haddr_t g_tag = 0;
+    hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */
+    hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */
+    int i,j,k = 0;           /* iterators */
+    int data[DIMS][DIMS];
+
+    /* Testing Macro */
+    TESTING("tag application during link name retrieval");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create file */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Create group */
+    if ( (gid = H5Gcreate(fid, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve group tag */
+    if ( get_new_object_header_tag(fid, &g_tag) < 0 ) TEST_ERROR;
+
+    /* Close Group */
+    if (H5Gclose(gid) < 0) TEST_ERROR;
+
+    /* Set up creation property list */
+    dcpl = H5Pcreate(H5P_DATASET_CREATE);
+    
+    /* Enable chunking */
+    if ( H5Pset_chunk(dcpl, RANK, cdims) < 0 ) TEST_ERROR;
+
+    /* Set up a fill value */
+    if ( H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillval) < 0 ) TEST_ERROR;
+
+    /* Set up dataset dataspace */
+    if ( (sid = H5Screate_simple(2, dims1, maxdims)) < 0 ) TEST_ERROR;
+
+    /* Create Dataset */
+    if (( did = H5Dcreate2(fid, DATASETNAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve tag associated with this dataset */
+    if ( get_new_object_header_tag(fid, &d_tag) < 0 ) TEST_ERROR;
+
+    /* fill out data buffer */
+    for(i=0;i<DIMS;i++) {
+        for(j=0;j<DIMS;j++) {
+
+            data[i][j] = k++;
+        } /* end for */
+    } /* end for */
+
+    /* Write to dataset */
+    if( (H5Dwrite(did, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, data)) < 0 ) TEST_ERROR;
+
+    /* Close Dataset */
+    if ( H5Dclose(did) < 0 ) TEST_ERROR;
+
+    /* Close and Reopen the file and dataset */
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Get name by index location. */
+    /* =========================== */
+
+    H5Lget_name_by_idx(fid, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)1, name, (size_t)500, H5P_DEFAULT);
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* Verify root group's tagged metadata */
+    if ( verify_tag(fid, H5AC_OHDR_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_SNODE_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_LHEAP_PRFX_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT_ID, root_tag) < 0 ) TEST_ERROR;
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_link_getname_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_external_link_creation_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during external link creation.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              February 24, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_external_link_creation_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    hid_t fid = -1;                         /* File Identifier */
+    hid_t fid2 = -1;                         /* File Identifier */
+    hid_t gid = -1;                         /* Dataspace Identifier */
+    int verbose = FALSE;                    /* verbose file outout */
+    haddr_t root_tag = 0;
+    haddr_t sbe_tag = 0;
+
+    /* Testing Macro */
+    TESTING("tag application during external link creation");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create a test file with provided fcpl_t */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Close and Reopen the file */
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* Create a second file */
+    if ( (fid2 = H5Fcreate(FILENAME2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Create group in second file */
+    if ( (gid = H5Gcreate(fid2, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Close out second file */
+    if ( (H5Gclose(gid)) < 0 ) TEST_ERROR;
+    if ( (H5Fclose(fid2)) < 0 ) TEST_ERROR;
+
+    /* ==================== */
+    /* Create External Link */
+    /* ==================== */
+    
+    if (H5Lcreate_external(FILENAME2, GROUPNAMEPATH, fid, LINKNAME, H5P_DEFAULT, H5P_DEFAULT) < 0 ) TEST_ERROR;
+
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+ 
+    /* Verify root group metadata */
+    if ( verify_tag(fid, H5AC_OHDR_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_OHDR_CHK_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_LHEAP_PRFX_ID, root_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_BT_ID, root_tag) < 0 ) TEST_ERROR;
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_external_link_creation_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_external_link_open_tags
+ *
+ * Purpose:     This function verifies the correct application of tags
+ *              during external link open.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              February 24, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned 
+check_external_link_open_tags(hid_t fcpl, int type)
+{
+    /* Variable Declarations */
+    haddr_t link_tag = 0;                  /* link tag */
+    hid_t fid = -1;                         /* File Identifier */
+    hid_t fid2 = -1;                        /* File Identifier */
+    hid_t gid = -1;                         /* Dataspace Identifier */
+    hid_t xid = -1;                         /* Dataspace Identifier */
+    int verbose = FALSE;                    /* verbose file outout */
+    haddr_t root_tag = 0;
+    haddr_t sbe_tag = 0;
+
+    /* Testing Macro */
+    TESTING("tag application during external link open");
+
+    /* ===== */
+    /* Setup */
+    /* ===== */
+
+    /* Create a test file with provided fcpl_t */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Retrieve various tags */
+    if ( type == TEST_DEFAULT ) {
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } else if ( type == TEST_SHMESG ) {
+        
+        /* determine tag value of sblock extension object header */
+        if ( get_new_object_header_tag(fid, &sbe_tag) < 0 ) TEST_ERROR;
+
+        /* determine tag value of root group's object header */
+        if ( get_new_object_header_tag(fid, &root_tag) < 0 ) TEST_ERROR;
+
+    } /* end if */
+
+    /* Create a second file */
+    if ( (fid2 = H5Fcreate(FILENAME2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Create group in second file */
+    if ( (gid = H5Gcreate(fid2, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Close out second file */
+    if ( (H5Gclose(gid)) < 0 ) TEST_ERROR;
+    if ( (H5Fclose(fid2)) < 0 ) TEST_ERROR;
+
+    /* Create external link to second file */
+    if ( H5Lcreate_external(FILENAME2, GROUPNAMEPATH, fid, LINKNAME, H5P_DEFAULT, H5P_DEFAULT) < 0 ) TEST_ERROR;
+
+    /* Close and Reopen the file */
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+    if ( (fid = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Evict as much as we can from the cache so we can track full tag path */
+    if ( evict_entries(fid) < 0 ) TEST_ERROR;
+
+    /* ================== */
+    /* Open External Link */
+    /* ================== */
+  
+    if ( (xid = H5Gopen2(fid, LINKNAME, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+    if ( (H5Gclose(xid)) < 0 ) TEST_ERROR;
+  
+    /* =================================== */
+    /* Verification of Metadata Tag Values */
+    /* =================================== */
+
+    /* if verbose, print cache index to screen for visual verification */
+    if ( verbose ) print_index(fid);
+
+    /* determine tag value of linked group's object header */
+    if ( get_new_object_header_tag(fid, &link_tag) < 0 ) TEST_ERROR;
+    if ( verify_tag(fid, H5AC_OHDR_CHK_ID, link_tag) < 0 ) TEST_ERROR;
+
+    /* verify no other entries present */
+    if ( verify_no_unknown_tags(fid) < 0 ) TEST_ERROR;
+
+    /* =========================== */
+    /* Close open objects and file */
+    /* =========================== */
+
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* ========================================== */
+    /* Finished Test. Print status and return. */
+    /* ========================================== */
+
+    PASSED();
+    return 0;
+
+error:
+    return 1;
+} /* check_external_link_open_tags */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_invalid_tag_application
+ *
+ * Purpose:     This function verifies that an error occurs if a tag
+ *              has not been set up during a protect or set of 
+ *              a new piece of metadata.
+ *
+ * Return:      0 on Success, 1 on Failure
+ *
+ * Programmer:  Mike McGreevy
+ *              May 27, 2010
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+check_invalid_tag_application(void)
+{
+    /* Variables */
+    H5F_t * f = NULL;
+    hid_t fid, dxpl_id = -1;
+    haddr_t addr;
+    H5HL_t * lheap = NULL;
+
+    /* Testing Macro */
+    TESTING("failure on invalid tag application");
+    
+    #if H5C_DO_TAGGING_SANITY_CHECKS
+    /* Create a test file */
+    if ( (fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0 ) TEST_ERROR;
+
+    /* Get internal file pointer*/
+    if ( NULL == (f = (H5F_t *)H5I_object(fid)) ) TEST_ERROR;
+
+    /* Create dxpl */
+    if ( dxpl_id = H5Pcreate(H5P_DATASET_XFER) < 0) TEST_ERROR;
+
+    /* Call H5HL_create, an internal function that calls H5AC_set without setting up a tag */
+    /* Ensure this returns FAILURE, as a tag has not been set up. */
+    if ( H5HL_create(f, H5AC_ind_dxpl_id, 1024, &addr) >= 0) TEST_ERROR;
+
+    /* Now set up a tag in the dxpl */
+    if ( H5AC_tag(H5AC_ind_dxpl_id, (haddr_t)25, NULL) < 0) TEST_ERROR;
+
+    /* Verify the same call to H5HL_create now works as intended, with a tag set up. */
+    if ( H5HL_create(f, H5AC_ind_dxpl_id, 1024, &addr) < 0) TEST_ERROR;
+
+    /* Reset dxpl to use invalid tag. */
+    if ( H5AC_tag(H5AC_ind_dxpl_id, H5AC__INVALID_TAG, NULL) < 0) TEST_ERROR;
+
+    /* Call H5HL_protect to protect the local heap created above. */
+    /* This should fail as no tag is set up during the protect call */
+    if (( lheap = H5HL_protect(f, H5AC_ind_dxpl_id, addr, H5AC_WRITE)) != NULL ) TEST_ERROR;
+
+    /* Again, set up a valid tag in the DXPL */
+    if ( H5AC_tag(H5AC_ind_dxpl_id, (haddr_t)25, NULL) < 0) TEST_ERROR;
+
+    /* Call H5HL_protect again to protect the local heap. This should succeed. */
+    if (( lheap = H5HL_protect(f, H5AC_ind_dxpl_id, addr, H5AC_WRITE)) == NULL ) TEST_ERROR;
+
+    /* Now unprotect the heap, as we're done with the test. */
+    if ( H5HL_unprotect(lheap) < 0 ) TEST_ERROR;
+
+    /* Close open objects and file */
+    if ( H5Fclose(fid) < 0 ) TEST_ERROR;
+
+    /* Finished Test. Print status and return. */
+    PASSED();
+    #else
+    SKIPPED();
+    printf("    test skipped because sanity checking on tag value is disabled.\n");
+    #endif
+
+    return 0;
+
+error:
+    return 1;
+} /* check_invalid_tag_application */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    main
+ *
+ * Purpose:     Run tests on library's ability to tag metadata entries.
+ *
+ * Return:      Success:
+ *
+ *              Failure:
+ *
+ * Programmer:  Mike McGreevy
+ *              January 15, 2009
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int 
+main(void) 
+{
+    /* Variable Declarations */
+    hid_t fcpl_default = -1;        /* file creation prop list */
+    hid_t fcpl_shmesg_all = -1;     /* file creation prop list */
+    hid_t fcpl = -1;                /* file creation prop list */
+    unsigned nerrs = 0;         /* Error Encountered */
+    int test_type = 0;          /* test type iterator */
+    
+    /* Open the HDF5 Library */
+    H5open();
+ 
+    /* ========== */   
+    /* Test Setup */
+    /* ========== */   
+
+    /* Create a standard file creation property list */
+    fcpl_default = H5Pcreate(H5P_FILE_CREATE);
+
+    /* Create an fcpl with shared messages and file space managment enabled */
+    fcpl_shmesg_all = H5Pcreate(H5P_FILE_CREATE);
+    H5Pset_shared_mesg_nindexes(fcpl_shmesg_all, 1);
+    H5Pset_shared_mesg_index(fcpl_shmesg_all, 0, H5O_SHMESG_ALL_FLAG, 20);
+    H5Pset_file_space(fcpl_shmesg_all, H5F_FILE_SPACE_ALL_PERSIST, (hsize_t)0);
+
+    /* ========= */
+    /* Run Tests */
+    /* ========= */
+
+    for (test_type=0; test_type<NUM_TEST_TYPES; test_type++) {
+    
+        /* Run tests on each fcpl set up above. */
+        if (test_type == TEST_DEFAULT) {
+
+            if (!nerrs) printf("Testing standard tag application cases w/ default fcpl:\n");
+            fcpl = fcpl_default;
+        
+        } else if (test_type == TEST_SHMESG) {
+
+            if (!nerrs) printf("Testing standard tag application cases w/ shared messages:\n");
+            fcpl = fcpl_shmesg_all;
+
+        } else {
+            TEST_ERROR;
+        }
+
+        /* Check tag application under different circumstances */
+        if (!nerrs) nerrs += check_file_creation_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_file_open_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_group_creation_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_multi_group_creation_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_group_open_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_attribute_creation_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_attribute_open_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_attribute_write_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_attribute_delete_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_attribute_rename_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_dataset_creation_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_dataset_creation_earlyalloc_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_dataset_open_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_dataset_write_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_dataset_read_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_dataset_size_retrieval(fcpl, test_type);
+        if (!nerrs && (test_type == TEST_DEFAULT)) nerrs += check_dataset_extend_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_object_info_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_link_removal_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_link_getname_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_external_link_creation_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_external_link_open_tags(fcpl, test_type);
+        if (!nerrs) nerrs += check_object_copy_tags(fcpl, test_type);
+
+    } /* end for */
+    
+    if (!nerrs) printf("Testing other specific tag application cases:\n");
+    if (!nerrs) nerrs += check_dense_attribute_tags();
+    if (!nerrs) nerrs += check_link_iteration_tags();
+    if (!nerrs) nerrs += check_invalid_tag_application();
+
+    /* Delete test files */
+    HDremove(FILENAME);
+    HDremove(FILENAME2);
+
+    /* Return Errors */
+    return(nerrs > 0);
+
+error:
+    /* Return with Error */
+    return(1);
+
+} /* main */
diff --git a/test/earray.c b/test/earray.c
index fe9e9c1..3a29948 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -322,6 +322,11 @@ create_file(hid_t fapl, hid_t *file, H5F_t **f)
     if(NULL == (*f = (H5F_t *)H5I_object(*file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if(H5AC_ignore_tags(*f) < 0) {
+        FAIL_STACK_ERROR
+    }
+
     /* Success */
     return(0);
 
@@ -449,6 +454,11 @@ reopen_file(hid_t *file, H5F_t **f, hid_t fapl, hid_t dxpl,
         if(NULL == (*f = (H5F_t *)H5I_object(*file)))
             FAIL_STACK_ERROR
 
+        /* Ignore metadata tags in the file's cache */
+        if(H5AC_ignore_tags(*f) < 0) {
+            FAIL_STACK_ERROR
+        }
+
         /* Re-open array, if given */
         if(ea) {
             if(NULL == (*ea = H5EA_open(*f, dxpl, ea_addr, NULL)))
diff --git a/test/farray.c b/test/farray.c
index 60a2200..8b6a617 100644
--- a/test/farray.c
+++ b/test/farray.c
@@ -158,6 +158,11 @@ create_file(hid_t fapl, hid_t *file, H5F_t **f)
     if(NULL == (*f = (H5F_t *)H5I_object(*file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if(H5AC_ignore_tags(*f) < 0) {
+        FAIL_STACK_ERROR
+    }
+
     /* Success */
     return(0);
 
@@ -289,6 +294,11 @@ reopen_file(hid_t *file, H5F_t **f, hid_t fapl, hid_t dxpl,
         if(NULL == (*f = (H5F_t *)H5I_object(*file)))
             FAIL_STACK_ERROR
 
+        /* Ignore metadata tags in the file's cache */
+        if(H5AC_ignore_tags(*f) < 0) {
+            FAIL_STACK_ERROR
+        }
+
         /* Re-open array, if given */
         if(fa) {
             if(NULL == (*fa = H5FA_open(*f, dxpl, fa_addr, NULL)))
diff --git a/test/fheap.c b/test/fheap.c
index 314b9ce..f983184 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -592,6 +592,10 @@ reopen_file(hid_t *file, H5F_t **f, const char *filename, hid_t fapl, hid_t dxpl
         if(NULL == (*f = (H5F_t *)H5I_object(*file)))
             FAIL_STACK_ERROR
 
+        /* Ignore metadata tags in the file's cache */
+        if (H5AC_ignore_tags(*f) < 0)
+            FAIL_STACK_ERROR
+
         /* Re-open heap */
         if(NULL == (*fh = H5HF_open(*f, dxpl, fh_addr)))
             FAIL_STACK_ERROR
@@ -639,6 +643,10 @@ open_heap(char *filename, hid_t fapl, hid_t dxpl, const H5HF_create_t *cparam,
         if(NULL == (*f = (H5F_t *)H5I_object(*file)))
             FAIL_STACK_ERROR
 
+        /* Ignore metadata tags in the file's cache */
+        if (H5AC_ignore_tags(*f) < 0)
+            FAIL_STACK_ERROR
+
         /* Create absolute heap */
         if(NULL == (*fh = H5HF_create(*f, dxpl, cparam)))
             FAIL_STACK_ERROR
@@ -677,6 +685,10 @@ open_heap(char *filename, hid_t fapl, hid_t dxpl, const H5HF_create_t *cparam,
     if(NULL == (*f = (H5F_t *)H5I_object(*file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(*f) < 0)
+        FAIL_STACK_ERROR
+
     /* Check for deleting the entire heap */
     if(tparam->del_dir == FHEAP_DEL_HEAP) {
         /* Create absolute heap */
@@ -1843,6 +1855,10 @@ test_create(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *tparam
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
     /*
      * Test fractal heap creation
      */
@@ -1956,6 +1972,10 @@ test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *tparam
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
     /*
      * Display testing message
      */
@@ -1994,6 +2014,11 @@ test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *tparam
         /* Get a pointer to the internal file object */
         if(NULL == (f = (H5F_t *)H5I_object(file)))
             FAIL_STACK_ERROR
+
+        /* Ignore metadata tags in the file's cache */
+        if (H5AC_ignore_tags(f) < 0)
+            FAIL_STACK_ERROR
+
     } /* end if */
 
     /* Re-open the heap */
@@ -2096,6 +2121,10 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *tp
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
     /*
      * Display testing message
      */
@@ -2144,6 +2173,10 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *tp
     if(NULL == (f2 = (H5F_t *)H5I_object(file2)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f2) < 0)
+        FAIL_STACK_ERROR
+
     /* Open the fractal heap through the second file handle */
     if(NULL == (fh2 = H5HF_open(f2, H5P_DATASET_XFER_DEFAULT, fh_addr)))
         FAIL_STACK_ERROR
@@ -2258,6 +2291,10 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *t
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
     /* Display test banner */
     TESTING("deleting open fractal heap");
 
@@ -2326,6 +2363,11 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *t
         /* Get a pointer to the internal file object */
         if(NULL == (f = (H5F_t *)H5I_object(file)))
             FAIL_STACK_ERROR
+
+        /* Ignore metadata tags in the file's cache */
+        if (H5AC_ignore_tags(f) < 0)
+            FAIL_STACK_ERROR
+
     } /* end if */
 
     /* Try re-opening the heap again (should fail, as heap is now deleted) */
@@ -2408,6 +2450,10 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam)
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
     /* Display testing message */
     TESTING("limits of heap ID lengths")
 
@@ -2747,6 +2793,10 @@ test_filtered_create(hid_t fapl, H5HF_create_t *cparam)
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
     /* Display testing message */
     TESTING("creating heaps with I/O filters")
 
@@ -2786,6 +2836,10 @@ test_filtered_create(hid_t fapl, H5HF_create_t *cparam)
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
     /* Re-open the heap */
     if(NULL == (fh = H5HF_open(f, H5P_DATASET_XFER_DEFAULT, fh_addr)))
         FAIL_STACK_ERROR
@@ -2862,6 +2916,10 @@ test_size(hid_t fapl, H5HF_create_t *cparam)
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
     /* Display testing message */
     TESTING("querying heap statistics")
 
@@ -2912,6 +2970,10 @@ test_size(hid_t fapl, H5HF_create_t *cparam)
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
     /* Re-open the heap */
     if(NULL == (fh = H5HF_open(f, H5P_DATASET_XFER_DEFAULT, fh_addr)))
         FAIL_STACK_ERROR
@@ -2997,6 +3059,10 @@ test_man_insert_weird(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, dxpl, cparam)))
         FAIL_STACK_ERROR
@@ -3103,6 +3169,10 @@ test_man_insert_first(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, dxpl, cparam)))
         FAIL_STACK_ERROR
@@ -3200,6 +3270,10 @@ test_man_insert_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, dxpl, cparam)))
         FAIL_STACK_ERROR
@@ -3293,6 +3367,10 @@ test_man_insert_root_mult(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, dxpl, cparam)))
         FAIL_STACK_ERROR
@@ -3388,6 +3466,10 @@ test_man_insert_force_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_par
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -3490,6 +3572,10 @@ test_man_insert_fill_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -3593,6 +3679,10 @@ test_man_insert_third_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -3700,6 +3790,10 @@ test_man_fill_first_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *t
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -3792,6 +3886,10 @@ test_man_start_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -3891,6 +3989,10 @@ test_man_fill_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -3988,6 +4090,10 @@ test_man_start_third_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -4095,6 +4201,10 @@ test_man_fill_fourth_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -4188,6 +4298,10 @@ test_man_fill_all_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -4280,6 +4394,10 @@ test_man_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -4378,6 +4496,10 @@ test_man_second_direct_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhe
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -4484,6 +4606,10 @@ test_man_fill_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -4583,6 +4709,10 @@ test_man_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -4690,6 +4820,10 @@ test_man_fill_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -4892,6 +5026,10 @@ test_man_start_2nd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -4997,6 +5135,10 @@ test_man_recursive_indirect_two_deep(hid_t fapl, H5HF_create_t *cparam, fheap_te
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -5096,6 +5238,10 @@ test_man_start_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -5202,6 +5348,10 @@ test_man_fill_first_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fh
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -5309,6 +5459,10 @@ test_man_fill_3rd_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fhea
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -5412,6 +5566,10 @@ test_man_fill_all_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhea
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -5516,6 +5674,10 @@ test_man_start_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -5627,6 +5789,10 @@ test_man_fill_first_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fh
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -5743,6 +5909,10 @@ test_man_fill_4th_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fhea
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -5851,6 +6021,10 @@ test_man_fill_all_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhea
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -5962,6 +6136,10 @@ test_man_start_5th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, H5P_DATASET_XFER_DEFAULT, cparam)))
         FAIL_STACK_ERROR
@@ -6092,6 +6270,10 @@ test_man_remove_bogus(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, dxpl, cparam)))
         FAIL_STACK_ERROR
@@ -6241,6 +6423,10 @@ test_man_remove_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, dxpl, cparam)))
         FAIL_STACK_ERROR
@@ -6278,6 +6464,10 @@ test_man_remove_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Re-open heap */
     if(NULL == (fh = H5HF_open(f, dxpl, fh_addr)))
         FAIL_STACK_ERROR
@@ -6397,6 +6587,10 @@ test_man_remove_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, dxpl, cparam)))
         FAIL_STACK_ERROR
@@ -6434,6 +6628,10 @@ test_man_remove_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Re-open heap */
     if(NULL == (fh = H5HF_open(f, dxpl, fh_addr)))
         FAIL_STACK_ERROR
@@ -6582,6 +6780,10 @@ test_man_remove_one_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, dxpl, cparam)))
         FAIL_STACK_ERROR
@@ -6619,6 +6821,10 @@ test_man_remove_one_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Re-open heap */
     if(NULL == (fh = H5HF_open(f, dxpl, fh_addr)))
         FAIL_STACK_ERROR
@@ -6743,6 +6949,10 @@ test_man_remove_two_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, dxpl, cparam)))
         FAIL_STACK_ERROR
@@ -6780,6 +6990,10 @@ test_man_remove_two_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Re-open heap */
     if(NULL == (fh = H5HF_open(f, dxpl, fh_addr)))
         FAIL_STACK_ERROR
@@ -6979,6 +7193,10 @@ test_man_remove_three_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Create absolute heap */
     if(NULL == (fh = H5HF_create(f, dxpl, cparam)))
         FAIL_STACK_ERROR
@@ -7016,6 +7234,10 @@ test_man_remove_three_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Re-open heap */
     if(NULL == (fh = H5HF_open(f, dxpl, fh_addr)))
         FAIL_STACK_ERROR
@@ -13362,6 +13584,10 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        STACK_ERROR
+
     /* Re-open the heap */
     if(NULL == (fh = H5HF_open(f, H5P_DATASET_XFER_DEFAULT, fh_addr)))
         FAIL_STACK_ERROR
@@ -14538,6 +14764,10 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
     /* Re-open the heap */
     if(NULL == (fh = H5HF_open(f, H5P_DATASET_XFER_DEFAULT, fh_addr)))
         FAIL_STACK_ERROR
@@ -14720,6 +14950,10 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
     /* Re-open the heap */
     if(NULL == (fh = H5HF_open(f, H5P_DATASET_XFER_DEFAULT, fh_addr)))
         FAIL_STACK_ERROR
@@ -14780,6 +15014,10 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
             if(NULL == (f = (H5F_t *)H5I_object(file)))
                 FAIL_STACK_ERROR
 
+            /* Ignore metadata tags in the file's cache */
+            if (H5AC_ignore_tags(f) < 0)
+                FAIL_STACK_ERROR
+
             /* Re-open the heap */
             if(NULL == (fh = H5HF_open(f, H5P_DATASET_XFER_DEFAULT, fh_addr)))
                 FAIL_STACK_ERROR
@@ -14812,6 +15050,10 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
             if(NULL == (f = (H5F_t *)H5I_object(file)))
                 FAIL_STACK_ERROR
 
+            /* Ignore metadata tags in the file's cache */
+            if (H5AC_ignore_tags(f) < 0)
+                FAIL_STACK_ERROR
+
             /* Re-open the heap */
             if(NULL == (fh = H5HF_open(f, H5P_DATASET_XFER_DEFAULT, fh_addr)))
                 FAIL_STACK_ERROR
@@ -14845,6 +15087,10 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
             if(NULL == (f = (H5F_t *)H5I_object(file)))
                 FAIL_STACK_ERROR
 
+            /* Ignore metadata tags in the file's cache */
+            if (H5AC_ignore_tags(f) < 0)
+                FAIL_STACK_ERROR
+
             /* Re-open the heap */
             if(NULL == (fh = H5HF_open(f, H5P_DATASET_XFER_DEFAULT, fh_addr)))
                 FAIL_STACK_ERROR
@@ -14877,6 +15123,10 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
             if(NULL == (f = (H5F_t *)H5I_object(file)))
                 FAIL_STACK_ERROR
 
+            /* Ignore metadata tags in the file's cache */
+            if (H5AC_ignore_tags(f) < 0)
+                FAIL_STACK_ERROR
+
             /* Re-open the heap */
             if(NULL == (fh = H5HF_open(f, H5P_DATASET_XFER_DEFAULT, fh_addr)))
                 FAIL_STACK_ERROR
@@ -15514,6 +15764,10 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
     /* Re-open the heap */
     if(NULL == (fh = H5HF_open(f, H5P_DATASET_XFER_DEFAULT, fh_addr)))
         FAIL_STACK_ERROR
@@ -15577,6 +15831,10 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
     /* Re-open the heap */
     if(NULL == (fh = H5HF_open(f, H5P_DATASET_XFER_DEFAULT, fh_addr)))
         FAIL_STACK_ERROR
@@ -15738,6 +15996,10 @@ test_bug1(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
     /* Re-open the heap */
     if(NULL == (fh = H5HF_open(f, H5P_DATASET_XFER_DEFAULT, fh_addr)))
         FAIL_STACK_ERROR
@@ -15764,6 +16026,10 @@ test_bug1(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
     if(NULL == (f = (H5F_t *)H5I_object(file)))
         FAIL_STACK_ERROR
 
+    /* Ignore metadata tags in the file's cache */
+    if (H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
     /* Re-open the heap */
     if(NULL == (fh = H5HF_open(f, H5P_DATASET_XFER_DEFAULT, fh_addr)))
         FAIL_STACK_ERROR
diff --git a/test/lheap.c b/test/lheap.c
index 52af202..1d98fc4 100644
--- a/test/lheap.c
+++ b/test/lheap.c
@@ -81,6 +81,11 @@ main(void)
 	H5Eprint2(H5E_DEFAULT, stdout);
 	goto error;
     }
+    if (H5AC_ignore_tags(f) < 0) {
+	H5_FAILED();
+	H5Eprint2(H5E_DEFAULT, stdout);
+	goto error;
+    }
     if(H5HL_create(f, H5P_DATASET_XFER_DEFAULT, (size_t)0, &heap_addr/*out*/) < 0) {
 	H5_FAILED();
 	H5Eprint2(H5E_DEFAULT, stdout);
@@ -124,6 +129,11 @@ main(void)
         H5Eprint2(H5E_DEFAULT, stdout);
         goto error;
     }
+    if (H5AC_ignore_tags(f) < 0) {
+	H5_FAILED();
+	H5Eprint2(H5E_DEFAULT, stdout);
+	goto error;
+    }
     for(i = 0; i < NOBJS; i++) {
         sprintf(buf, "%03d-", i);
         for(j = 4; j < i; j++)
diff --git a/test/ohdr.c b/test/ohdr.c
index 37699e5..dad06cf 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -71,6 +71,11 @@ test_cont(char *filename, hid_t fapl)
     /* Create the file to operate on */
     if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
     if(NULL == (f = (H5F_t *)H5I_object(file))) FAIL_STACK_ERROR
+    if (H5AC_ignore_tags(f) < 0) {
+	H5_FAILED();
+	H5Eprint2(H5E_DEFAULT, stdout);
+	goto error;
+    }
 
     HDmemset(&oh_locA, 0, sizeof(oh_locA));
     HDmemset(&oh_locB, 0, sizeof(oh_locB));
@@ -198,6 +203,11 @@ main(void)
             TEST_ERROR
         if(NULL == (f = (H5F_t *)H5I_object(file)))
             FAIL_STACK_ERROR
+        if (H5AC_ignore_tags(f) < 0) {
+	    H5_FAILED();
+	    H5Eprint2(H5E_DEFAULT, stdout);
+	    goto error;
+        }
 
 
         /*
@@ -292,6 +302,8 @@ main(void)
             FAIL_STACK_ERROR
         if(NULL == (f = (H5F_t *)H5I_object(file)))
             FAIL_STACK_ERROR
+        if (H5AC_ignore_tags(f) < 0)
+            FAIL_STACK_ERROR
         oh_loc.file = f;
         if(H5O_open(&oh_loc) < 0)
             FAIL_STACK_ERROR