diff --git a/tools/testfiles/h5dumptst.c b/tools/testfiles/h5dumptst.c
index b145b3d9ba..7cc9eb482a 100644
--- a/tools/testfiles/h5dumptst.c
+++ b/tools/testfiles/h5dumptst.c
@@ -14,6 +14,8 @@
 #define FILE8 "tdset2.h5"
 #define FILE9 "tcompound2.h5"
 #define FILE10 "tloop.h5"
+#define FILE11 "tloop2.h5"
+#define FILE12 "tmany.h5"
 
 static void test_group(void) {
 hid_t fid, group;
@@ -734,6 +736,17 @@ float dset2_1[10], dset2_2[3][5];
 
 }
 
+/*
+            o
+          /___\
+      g1 o/   \o g2
+          \___/  
+
+   
+o - group objects
+
+*/
+
 static void test_loop(void) {
 hid_t fid, group;
 
@@ -750,6 +763,204 @@ hid_t fid, group;
   H5Fclose(fid);
 }
 
+static void test_loop2(void) {
+hid_t fid, group;
+
+  fid = H5Fcreate(FILE11, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+  /* create group object g1 and implcit path from root object */
+  group = H5Gcreate (fid, "/g1", 0);
+  H5Gclose(group);
+
+  /* create group object g2 and implcit path from root object */
+  group = H5Gcreate (fid, "/g2", 0);
+  H5Gclose(group);
+
+  /* create path from object at /g1 to object at /g2 and name it g1.1 */
+  H5Glink (fid, H5G_LINK_HARD, "/g2", "/g1/g1.1"); /* 
+
+  /* create path from object at /g2 to object at /g1 and name it g2.1 */
+  H5Glink (fid, H5G_LINK_SOFT, "/g1", "/g2/g2.1");
+
+  H5Fclose(fid);
+
+}
+
+/*
+                  /
+     |       |       |   \    \    \
+     g1     g2      g3   g4   g5    g6
+    / \      |       |    \     \    \
+ g1.1 g1.2 slink2  link3 dset2 slink4 dset3
+  |    |    (g1)  (dset2)      (dset3)
+ dset1 link1
+      (dset1)
+*/
+
+static void test_many(void) {
+hid_t fid, group, attr, dataset, space, space2, type, create_plist;
+hsize_t dims[2];
+int data[2][2], dset2[10][10], dset3[10][10];
+double d[10];
+
+char buf[60];
+int i, j;
+int i0, i1, i2, i3;
+int a[2][2][2][2];
+double b[2][2][2][2];
+double c[2][2][2][2];
+hsize_t sdim, maxdim;
+
+typedef struct {	/* compound type has members with rank > 1	*/
+  int a[2][2][2][2];	/* arrays are 2x2x2x2				*/
+  double b[2][2][2][2];
+  double c[2][2][2][2];
+} dset1_t;
+dset1_t dset1[6];
+
+size_t dim[4];
+int index[4] = {0,1,2,3};  /* normal indicies */
+const int perm[4] = {0,1,2,3};  /* the 0'th and the 3'rd indices are permuted */
+
+  fid = H5Fcreate(FILE12, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+  group = H5Gcreate (fid, "/g1", 0);
+  H5Gclose(group);
+
+  create_plist = H5Pcreate(H5P_DATASET_CREATE);
+
+  sdim = 2;
+  H5Pset_chunk(create_plist, 1, &sdim);
+
+  group = H5Gcreate (fid, "/g1/g1.1", 0);
+
+  type = H5Tcreate (H5T_COMPOUND, sizeof(dset1[0]));
+
+  dim[0] = dim[1] = dim[2] = dim[3] = 2;
+  H5Tinsert_array(type, "a_array", HOFFSET(dset1_t, a), 4, dim, perm, H5T_STD_I32BE);
+  H5Tinsert_array(type, "b_array", HOFFSET(dset1_t, b), 4, dim, perm, H5T_IEEE_F64BE);
+  H5Tinsert_array(type, "c_array", HOFFSET(dset1_t, c), 4, dim, perm, H5T_IEEE_F64BE);
+
+/*
+  H5Tcommit(group, "type1", type);
+*/
+
+  /* dset1 */
+  sdim = 6;
+  maxdim = H5S_UNLIMITED;
+  space = H5Screate_simple(1, &sdim, &maxdim);
+  dataset = H5Dcreate(group, "dset1", type, space, create_plist);
+
+  /* add attributes to dset1 */
+  dims[0] = 10;
+  space2 = H5Screate_simple(1, dims, NULL);
+  attr = H5Acreate (dataset, "attr1", H5T_NATIVE_CHAR, space2, H5P_DEFAULT);
+  sprintf(buf, "abcdefghi");
+  H5Awrite(attr, H5T_NATIVE_CHAR, buf);
+  H5Sclose(space2);
+  H5Aclose(attr);
+
+  dims[0] = 2; dims[1] = 2;
+  space2 = H5Screate_simple(2, dims, NULL);
+  attr = H5Acreate (dataset, "attr2", H5T_STD_I32BE, space2, H5P_DEFAULT);
+  data[0][0] = 0; data[0][1] = 1; data[1][0] = 2; data[1][1] = 3;
+  H5Awrite(attr, H5T_STD_I32BE, data);
+  H5Sclose(space2);
+  H5Aclose(attr);
+
+  dims[0] = 10;
+  space2 = H5Screate_simple(1, dims, NULL);
+  attr = H5Acreate (dataset, "attr3", H5T_IEEE_F64BE, space2, H5P_DEFAULT);
+  for (i = 0; i < 10; i++) d[i] = 0.1 * i;
+  H5Awrite(attr, H5T_IEEE_F64BE, d);
+  H5Sclose(space2);
+  H5Aclose(attr);
+
+  for (j=0; j<sdim; j++) {
+	for (i3 = 0; i3 < 2; i3++) {
+		index[perm[3]] = i3;
+	for (i2 = 0; i2 < 2; i2++) {
+		index[perm[2]] = i2;
+	for (i1 = 0; i1 < 2; i1++) {
+		index[perm[1]] = i1;
+	for (i0 = 0; i0 < 2; i0++) {
+		index[perm[0]] = i0;
+		
+		dset1[j].a[index[3]][index[2]][index[1]][index[0]] = i0+j;
+		dset1[j].b[index[3]][index[2]][index[1]][index[0]] = (double)(i0+j);
+		dset1[j].c[index[3]][index[2]][index[1]][index[0]] = (double)(i0+j+sdim);
+	}
+	}
+	}
+	}
+  }
+
+  H5Dwrite(dataset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset1);
+
+  H5Dclose(dataset);
+  H5Sclose(space);
+
+  H5Tclose(type);
+  H5Gclose(group);
+
+  group = H5Gcreate (fid, "/g1/g1.2", 0);
+  H5Glink (group, H5G_LINK_HARD, "/g1/g1.1/dset1", "link1");
+  H5Gclose(group);
+
+  group = H5Gcreate (fid, "/g2", 0);
+  H5Glink (group, H5G_LINK_SOFT, "/g1", "slink2");
+  H5Gclose(group);
+
+  group = H5Gcreate (fid, "/g3", 0);
+  H5Gclose(group);
+
+  group = H5Gcreate (fid, "/g4", 0);
+
+  /* dset2 */
+  dims[0] = 10; dims[1] = 10;
+  space = H5Screate_simple(2, dims, NULL);
+
+  dataset = H5Dcreate(group, "dset2", H5T_STD_I32BE, space, H5P_DEFAULT);
+  for (i = 0; i < 10; i++)
+       for (j = 0; j < 10; j++)
+            dset2[i][j] = j;
+  H5Dwrite(dataset, H5T_STD_I32BE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset2);
+
+  H5Dclose(dataset);
+
+  H5Sclose(space);
+  H5Gclose(group);
+
+  group = H5Gopen(fid, "/g3");
+  H5Glink (group, H5G_LINK_HARD, "/g4/dset2", "link3");
+  H5Gclose(group);
+
+  group = H5Gcreate (fid, "/g5", 0);
+  H5Gclose(group);
+
+  group = H5Gcreate (fid, "/g6", 0);
+  /* dset3 */
+  dims[0] = 10; dims[1] = 10;
+  space = H5Screate_simple(2, dims, NULL);
+
+  dataset = H5Dcreate(group, "dset3", H5T_STD_I32BE, space, H5P_DEFAULT);
+  for (i = 0; i < 10; i++)
+       for (j = 0; j < 10; j++)
+            dset3[i][j] = i;
+  H5Dwrite(dataset, H5T_STD_I32BE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset3);
+
+  H5Dclose(dataset);
+
+  H5Sclose(space);
+  H5Gclose(group);
+
+  group = H5Gopen(fid, "/g5");
+  H5Glink (group, H5G_LINK_SOFT, "/g6/dset3", "slink4");
+  H5Gclose(group);
+
+  H5Fclose(fid);
+
+}
 
 int main(void){
 
@@ -757,12 +968,16 @@ test_group();
 test_attribute();
 test_softlink();
 test_dataset();
-test_dataset2();
 test_hardlink();
 test_compound_dt();
-test_compound_dt2();
-test_loop();
 test_all();
+test_loop();
+
+test_dataset2();
+test_compound_dt2();
+test_loop2();
+test_many();
+
 return 0;
 
 }
diff --git a/tools/testfiles/tall.dmp b/tools/testfiles/tall.dmp
index 6c53f3b42c..40ab6aaa30 100644
--- a/tools/testfiles/tall.dmp
+++ b/tools/testfiles/tall.dmp
@@ -18,7 +18,7 @@ Entries:-
    number of attributes = 0 
      #1 (Vgroup)
 	tag = 1965;reference = 13;
-	number of entries = 0;
+	number of entries = 2;
 	name = g2; class = HDF5
    number of attributes = 0 
 
@@ -31,7 +31,7 @@ Vgroup:1
 Entries:-
      #0 (Vgroup)
 	tag = 1965;reference = 6;
-	number of entries = 0;
+	number of entries = 2;
 	name = g1.1; class = HDF5
    number of attributes = 0 
      #1 (Vgroup)
@@ -44,10 +44,13 @@ Entries:-
 Vgroup:2
      tag = 1965; reference = 6;
      name = g1.1; class = HDF5;
-     number of entries = 0;
+     number of entries = 2;
    number of attributes = 0 
 Entries:-
-     None.
+     #0 (Numeric Data Group)
+	tag = 720; reference = 7;
+     #1 (Numeric Data Group)
+	tag = 720; reference = 9;
 
 
 Vgroup:3
@@ -75,10 +78,13 @@ Entries:-
 Vgroup:5
      tag = 1965; reference = 13;
      name = g2; class = HDF5;
-     number of entries = 0;
+     number of entries = 2;
    number of attributes = 0 
 Entries:-
-     None.
+     #0 (Numeric Data Group)
+	tag = 720; reference = 14;
+     #1 (Numeric Data Group)
+	tag = 720; reference = 16;
 
 
 Vgroup:6
@@ -340,20 +346,25 @@ Entries:-
 Graphical representation of the file:-
 (vg#: vgroup;   vd: vdata)
 
-   vg0 	-- vg1 	-- vg2 
+   vg0 	-- vg1 	-- vg2 	-- Numeric Data Group  
+			-- Numeric Data Group  
 		-- vg3 	-- vg4 
-	-- vg5 
+	-- vg5 	-- Numeric Data Group  
+		-- Numeric Data Group  
 
-   vg1 	-- vg2 
+   vg1 	-- vg2 	-- Numeric Data Group  
+		-- Numeric Data Group  
 	-- vg3 	-- vg4 
 
-   vg2 
+   vg2 	-- Numeric Data Group  
+	-- Numeric Data Group  
 
    vg3 	-- vg4 
 
    vg4 
 
-   vg5 
+   vg5 	-- Numeric Data Group  
+	-- Numeric Data Group  
 
    vg6 	-- vd  
 
diff --git a/tools/testfiles/tall.h5 b/tools/testfiles/tall.h5
index 8ccc0e0450..3259f01722 100644
Binary files a/tools/testfiles/tall.h5 and b/tools/testfiles/tall.h5 differ
diff --git a/tools/testfiles/tattr-1.ddl b/tools/testfiles/tattr-1.ddl
index bdf4f3c327..996b70a02b 100644
--- a/tools/testfiles/tattr-1.ddl
+++ b/tools/testfiles/tattr-1.ddl
@@ -24,5 +24,19 @@ GROUP "/" {
          0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9
       }
    }
+   ATTRIBUTE "attr4" {
+      DATATYPE { "H5T_STD_I32BE" }
+      DATASPACE { ARRAY ( 0 ) ( 0 ) }
+      DATA {
+         100
+      }
+   }
+   ATTRIBUTE "attr5" {
+      DATATYPE { "undefined string" }
+      DATASPACE { ARRAY ( 0 ) ( 0 ) }
+      DATA {
+         Unable to print data.
+      }
+   }
 }
 }
diff --git a/tools/testfiles/tattr-4.ddl b/tools/testfiles/tattr-4.ddl
index a110bef571..77c888c2cc 100644
--- a/tools/testfiles/tattr-4.ddl
+++ b/tools/testfiles/tattr-4.ddl
@@ -3,6 +3,10 @@ Expected output for 'h5dump -a attr4 tattr.h5'
 #############################
 HDF5 "tattr.h5" {
 ATTRIBUTE "attr4" {
-   h5dump error: unable to open attribute.
+   DATATYPE { "H5T_STD_I32BE" }
+   DATASPACE { ARRAY ( 0 ) ( 0 ) }
+   DATA {
+      100
+   }
 }
 }
diff --git a/tools/testfiles/tattr.dmp b/tools/testfiles/tattr.dmp
index 277c0b6e9e..63a74547ba 100644
--- a/tools/testfiles/tattr.dmp
+++ b/tools/testfiles/tattr.dmp
@@ -5,7 +5,7 @@ Vgroup:0
      tag = 1965; reference = 2;
      name = /; class = HDF5;
      number of entries = 0;
-   number of attributes = 3 
+   number of attributes = 4 
     attr0: name=attr1 type=20 count=24 size=24
 	97 116 116 114 105 98 117 116 101 32 111 102 32 114 111 
 	111 116 32 103 114 111 117 112 0 
@@ -14,6 +14,8 @@ Vgroup:0
     attr2: name=attr3 type=6 count=10 size=80
 	0.000000 0.100000 0.200000 0.300000 0.400000 0.500000 0.600000 
 	0.700000 0.800000 0.900000 
+    attr3: name=attr4 type=24 count=1 size=4
+	100 
 Entries:-
      None.
 
@@ -61,4 +63,16 @@ Vdata: 2
 Loc.     Data
 0        0.000000 0.100000 0.200000 0.300000 0.400000 0.500000 0.600000 0.700000 0.800000 0.900000  ; 
 
+Vdata: 3
+   tag = 1962; reference = 6;
+   number of records = 1; interlace = 0;
+   fields = [VALUES];
+   record size (in bytes) = 4;
+   name = attr4; class = Attr0.0;
+   number of attributes = 0 
+- field index 0: [VALUES], type=24, order=1
+   number of attributes = 0 
+Loc.     Data
+0        100  ; 
+
 File name: testfiles/tattr.hdf 
diff --git a/tools/testfiles/tattr.h5 b/tools/testfiles/tattr.h5
index a75bb5246a..6a98734023 100644
Binary files a/tools/testfiles/tattr.h5 and b/tools/testfiles/tattr.h5 differ
diff --git a/tools/testfiles/tcomp-1.ddl b/tools/testfiles/tcomp-1.ddl
index d837aff40b..0f1c79fd36 100644
--- a/tools/testfiles/tcomp-1.ddl
+++ b/tools/testfiles/tcomp-1.ddl
@@ -3,7 +3,7 @@ Expected output for 'h5dump tcompound.h5'
 #############################
 HDF5 "tcompound.h5" {
 GROUP "/" {
-   DATATYPE "#3432:0" {
+   DATATYPE "#5992:0" {
       H5T_STD_I32BE int;
       H5T_IEEE_F32BE float;
    }
@@ -28,6 +28,32 @@ GROUP "/" {
             {0,0}, {1,1.1}, {2,2.2}, {3,3.3}, {4,4.4}
          }
       }
+      DATASET "dset3" {
+         DATATYPE {
+            HARDLINK { "/type2" }
+         }
+         DATASPACE { ARRAY ( 3, 6 ) ( 3, 6 ) }
+         DATA {
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+            {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}
+         }
+      }
       DATASET "dset4" {
          DATATYPE {
             HARDLINK { "/group1/type3" }
@@ -45,11 +71,11 @@ GROUP "/" {
    GROUP "group2" {
       DATASET "dset5" {
          DATATYPE {
-            HARDLINK { "#3432:0" }
+            HARDLINK { "#5992:0" }
          }
          DATASPACE { ARRAY ( 5 ) ( 5 ) }
          DATA {
-            {0,0}, {1,1}, {2,2}, {3,3}, {4,4}
+            {0,0}, {1,0.1}, {2,0.2}, {3,0.3}, {4,0.4}
          }
       }
    }
@@ -59,7 +85,7 @@ GROUP "/" {
    }
    DATATYPE "type2" {
       H5T_STD_I32BE int_array[4];
-      H5T_STD_I32BE float_array[5][6];
+      H5T_IEEE_F32BE float_array[5][6];
    }
 }
 }
diff --git a/tools/testfiles/tcomp-2.ddl b/tools/testfiles/tcomp-2.ddl
index 9b6bb89231..d3c27df09b 100644
--- a/tools/testfiles/tcomp-2.ddl
+++ b/tools/testfiles/tcomp-2.ddl
@@ -8,7 +8,7 @@ DATATYPE "/type1" {
 }
 DATATYPE "/type2" {
    H5T_STD_I32BE int_array[4];
-   H5T_STD_I32BE float_array[5][6];
+   H5T_IEEE_F32BE float_array[5][6];
 }
 DATATYPE "/group1/type3" {
    H5T_STD_I32BE int;
diff --git a/tools/testfiles/tcomp-3.ddl b/tools/testfiles/tcomp-3.ddl
index c5fd1d47bd..ebbc895056 100644
--- a/tools/testfiles/tcomp-3.ddl
+++ b/tools/testfiles/tcomp-3.ddl
@@ -4,11 +4,11 @@ Expected output for 'h5dump -d /group2/dset5 -g /group1 tcompound.h5'
 HDF5 "tcompound.h5" {
 DATASET "/group2/dset5" {
    DATATYPE {
-      HARDLINK { "#3432:0" }
+      HARDLINK { "#5992:0" }
    }
    DATASPACE { ARRAY ( 5 ) ( 5 ) }
    DATA {
-      {0,0}, {1,1}, {2,2}, {3,3}, {4,4}
+      {0,0}, {1,0.1}, {2,0.2}, {3,0.3}, {4,0.4}
    }
 }
 GROUP "/group1" {
@@ -21,6 +21,32 @@ GROUP "/group1" {
          {0,0}, {1,1.1}, {2,2.2}, {3,3.3}, {4,4.4}
       }
    }
+   DATASET "dset3" {
+      DATATYPE {
+         HARDLINK { "/type2" }
+      }
+      DATASPACE { ARRAY ( 3, 6 ) ( 3, 6 ) }
+      DATA {
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]},
+         {[0,1,2,3],[0.1,0.1,0.1,0.1,0.1,0.1,0.2,0.2,0.2,0.2,0.2,0.2,0.3,0.3,0.3,0.3,0.3,0.3,0.4,0.4,0.4,0.4,0.4,0.4,0.5,0.5,0.5,0.5,0.5,0.5]}
+      }
+   }
    DATASET "dset4" {
       DATATYPE {
          HARDLINK { "/group1/type3" }
diff --git a/tools/testfiles/tcomp-4.ddl b/tools/testfiles/tcomp-4.ddl
index 2ae8e4c7e3..80ed99796d 100644
--- a/tools/testfiles/tcomp-4.ddl
+++ b/tools/testfiles/tcomp-4.ddl
@@ -3,17 +3,16 @@ Expected output for 'h5dump -t /#3432:0 -g /group2 tcompound.h5'
 #############################
 HDF5 "tcompound.h5" {
 DATATYPE "/#3432:0" {
-   H5T_STD_I32BE int;
-   H5T_IEEE_F32BE float;
+   h5dump error: unable to open /#3432:0
 }
 GROUP "/group2" {
    DATASET "dset5" {
       DATATYPE {
-         HARDLINK { "#3432:0" }
+         HARDLINK { "#5992:0" }
       }
       DATASPACE { ARRAY ( 5 ) ( 5 ) }
       DATA {
-         {0,0}, {1,1}, {2,2}, {3,3}, {4,4}
+         {0,0}, {1,0.1}, {2,0.2}, {3,0.3}, {4,0.4}
       }
    }
 }
diff --git a/tools/testfiles/tcompound.dmp b/tools/testfiles/tcompound.dmp
index d513cf1fce..c0da354928 100644
--- a/tools/testfiles/tcompound.dmp
+++ b/tools/testfiles/tcompound.dmp
@@ -4,17 +4,24 @@ File name: testfiles/tcompound.hdf
 Vgroup:0
      tag = 1965; reference = 2;
      name = /; class = HDF5;
-     number of entries = 2;
+     number of entries = 3;
    number of attributes = 0 
 Entries:-
-     #0 (Vgroup)
+     #0 (Vdata)
+	tag = 1962; reference = 3; 
+	number of records = 5; interlace = 0;
+	fields = [a_name, b_name, c_name];
+	record size (in bytes) = 16;
+	name = dset1; class = HDF5;
+	total number of attributes = 0.
+     #1 (Vgroup)
 	tag = 1965;reference = 4;
-	number of entries = 0;
+	number of entries = 2;
 	name = group1; class = HDF5
    number of attributes = 0 
-     #1 (Vgroup)
+     #2 (Vgroup)
 	tag = 1965;reference = 10;
-	number of entries = 0;
+	number of entries = 1;
 	name = group2; class = HDF5
    number of attributes = 0 
 
@@ -22,30 +29,52 @@ Entries:-
 Vgroup:1
      tag = 1965; reference = 4;
      name = group1; class = HDF5;
-     number of entries = 0;
+     number of entries = 2;
    number of attributes = 0 
 Entries:-
-     None.
+     #0 (Vdata)
+	tag = 1962; reference = 5; 
+	number of records = 5; interlace = 0;
+	fields = [int_name, float_name];
+	record size (in bytes) = 8;
+	name = dset2; class = HDF5;
+	total number of attributes = 0.
+     #1 (Vdata)
+	tag = 1962; reference = 7; 
+	number of records = 5; interlace = 0;
+	fields = [int, float];
+	record size (in bytes) = 8;
+	name = dset4; class = HDF5;
+	total number of attributes = 0.
 
 
 Vgroup:2
      tag = 1965; reference = 10;
      name = group2; class = HDF5;
-     number of entries = 0;
+     number of entries = 1;
    number of attributes = 0 
 Entries:-
-     None.
+     #0 (Vdata)
+	tag = 1962; reference = 11; 
+	number of records = 5; interlace = 0;
+	fields = [int, float];
+	record size (in bytes) = 8;
+	name = dset5; class = HDF5;
+	total number of attributes = 0.
 
 
 Graphical representation of the file:-
 (vg#: vgroup;   vd: vdata)
 
-   vg0 	-- vg1 
-	-- vg2 
+   vg0 	-- vd  
+	-- vg1 	-- vd  
+		-- vd  
+	-- vg2 	-- vd  
 
-   vg1 
+   vg1 	-- vd  
+	-- vd  
 
-   vg2 
+   vg2 	-- vd  
 
 File name: testfiles/tcompound.hdf 
 
@@ -108,7 +137,7 @@ Vdata: 3
 - field index 1: [float], type=5, order=1
    number of attributes = 0 
 Loc.     Data
-0        0  0.000000  ; 1  1.000000  ; 2  2.000000  ; 
-3        3  3.000000  ; 4  4.000000  ; 
+0        0  0.000000  ; 1  0.100000  ; 2  0.200000  ; 
+3        3  0.300000  ; 4  0.400000  ; 
 
 File name: testfiles/tcompound.hdf 
diff --git a/tools/testfiles/tcompound.h5 b/tools/testfiles/tcompound.h5
index 8c8eb691bb..65b5d091d1 100644
Binary files a/tools/testfiles/tcompound.h5 and b/tools/testfiles/tcompound.h5 differ
diff --git a/tools/testfiles/tcompound2.dmp b/tools/testfiles/tcompound2.dmp
index 4a16d87e1f..24752263b8 100644
--- a/tools/testfiles/tcompound2.dmp
+++ b/tools/testfiles/tcompound2.dmp
@@ -4,17 +4,24 @@ File name: testfiles/tcompound2.hdf
 Vgroup:0
      tag = 1965; reference = 2;
      name = /; class = HDF5;
-     number of entries = 2;
+     number of entries = 3;
    number of attributes = 0 
 Entries:-
-     #0 (Vgroup)
+     #0 (Vdata)
+	tag = 1962; reference = 3; 
+	number of records = 6; interlace = 0;
+	fields = [a_name, b_name, c_name];
+	record size (in bytes) = 16;
+	name = dset1; class = HDF5;
+	total number of attributes = 0.
+     #1 (Vgroup)
 	tag = 1965;reference = 4;
-	number of entries = 0;
+	number of entries = 2;
 	name = group1; class = HDF5
    number of attributes = 0 
-     #1 (Vgroup)
+     #2 (Vgroup)
 	tag = 1965;reference = 10;
-	number of entries = 0;
+	number of entries = 1;
 	name = group2; class = HDF5
    number of attributes = 0 
 
@@ -22,30 +29,52 @@ Entries:-
 Vgroup:1
      tag = 1965; reference = 4;
      name = group1; class = HDF5;
-     number of entries = 0;
+     number of entries = 2;
    number of attributes = 0 
 Entries:-
-     None.
+     #0 (Vdata)
+	tag = 1962; reference = 5; 
+	number of records = 6; interlace = 0;
+	fields = [int_name, float_name];
+	record size (in bytes) = 8;
+	name = dset2; class = HDF5;
+	total number of attributes = 0.
+     #1 (Vdata)
+	tag = 1962; reference = 7; 
+	number of records = 6; interlace = 0;
+	fields = [int, float];
+	record size (in bytes) = 8;
+	name = dset4; class = HDF5;
+	total number of attributes = 0.
 
 
 Vgroup:2
      tag = 1965; reference = 10;
      name = group2; class = HDF5;
-     number of entries = 0;
+     number of entries = 1;
    number of attributes = 0 
 Entries:-
-     None.
+     #0 (Vdata)
+	tag = 1962; reference = 11; 
+	number of records = 6; interlace = 0;
+	fields = [int, float];
+	record size (in bytes) = 8;
+	name = dset5; class = HDF5;
+	total number of attributes = 0.
 
 
 Graphical representation of the file:-
 (vg#: vgroup;   vd: vdata)
 
-   vg0 	-- vg1 
-	-- vg2 
+   vg0 	-- vd  
+	-- vg1 	-- vd  
+		-- vd  
+	-- vg2 	-- vd  
 
-   vg1 
+   vg1 	-- vd  
+	-- vd  
 
-   vg2 
+   vg2 	-- vd  
 
 File name: testfiles/tcompound2.hdf 
 
diff --git a/tools/testfiles/tcompound2.h5 b/tools/testfiles/tcompound2.h5
index 6df3bf56de..4747c4b6e5 100644
Binary files a/tools/testfiles/tcompound2.h5 and b/tools/testfiles/tcompound2.h5 differ
diff --git a/tools/testfiles/tdset-1.ddl b/tools/testfiles/tdset-1.ddl
index c5f4fb692e..8eb043eb5e 100644
--- a/tools/testfiles/tdset-1.ddl
+++ b/tools/testfiles/tdset-1.ddl
@@ -23,23 +23,83 @@ GROUP "/" {
    }
    DATASET "dset2" {
       DATATYPE { "H5T_IEEE_F64BE" }
-      DATASPACE { ARRAY ( 30, 10 ) ( 30, 10 ) }
+      DATASPACE { ARRAY ( 30, 20 ) ( 30, 20 ) }
       DATA {
-         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0,
-         1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1,
-         2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2,
-         3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3,
-         4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4,
-         5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5,
-         6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6,
-         7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7,
-         8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8,
-         9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0,
-         1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1,
-         2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2,
-         3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3,
-         4, 5, 6, 7, 8, 9
+         0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+         0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+         0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+         0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+         0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019,
+         0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+         0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+         0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+         0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+         0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019,
+         0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+         0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+         0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+         0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+         0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019,
+         0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+         0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+         0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+         0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+         0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019,
+         0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+         0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+         0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+         0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+         0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019,
+         0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+         0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+         0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+         0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+         0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019,
+         0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+         0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+         0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+         0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+         0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019,
+         0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+         0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+         0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+         0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+         0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019,
+         0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+         0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+         0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+         0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+         0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019,
+         0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+         0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+         0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+         0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+         0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019,
+         0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+         0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+         0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+         0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+         0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019,
+         0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+         0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+         0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+         0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+         0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019,
+         0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+         0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+         0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+         0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+         0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019,
+         0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+         0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+         0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+         0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+         0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019,
+         0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+         0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+         0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+         0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+         0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019
       }
    }
 }
diff --git a/tools/testfiles/tdset-2.ddl b/tools/testfiles/tdset-2.ddl
index 177a10fabb..735b28a6a6 100644
--- a/tools/testfiles/tdset-2.ddl
+++ b/tools/testfiles/tdset-2.ddl
@@ -21,22 +21,80 @@ DATASET "dset1" {
 }
 DATASET "/dset2" {
    DATATYPE { "H5T_IEEE_F64BE" }
-   DATASPACE { ARRAY ( 30, 10 ) ( 30, 10 ) }
+   DATASPACE { ARRAY ( 30, 20 ) ( 30, 20 ) }
    DATA {
-      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1,
-      2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3,
-      4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5,
-      6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7,
-      8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1,
-      2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3,
-      4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5,
-      6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7,
-      8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1,
-      2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3,
-      4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5,
-      6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
+      0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008,
+      0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016,
+      0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005,
+      0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013,
+      0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002,
+      0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001,
+      0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018,
+      0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+      0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+      0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004,
+      0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012,
+      0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001,
+      0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009,
+      0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017,
+      0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006,
+      0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014,
+      0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+      0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+      0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0,
+      0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008,
+      0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016,
+      0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005,
+      0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013,
+      0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002,
+      0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001,
+      0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018,
+      0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+      0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+      0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004,
+      0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012,
+      0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001,
+      0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009,
+      0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017,
+      0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006,
+      0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014,
+      0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+      0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+      0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0,
+      0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008,
+      0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016,
+      0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005,
+      0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013,
+      0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002,
+      0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001,
+      0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018,
+      0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+      0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+      0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004,
+      0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012,
+      0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001,
+      0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009,
+      0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017,
+      0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006,
+      0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014,
+      0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003,
+      0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011,
+      0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0,
+      0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008,
+      0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016,
+      0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005,
+      0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013,
+      0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002,
+      0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001,
+      0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018,
+      0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007,
+      0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015,
+      0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001, 0.0002, 0.0003, 0.0004,
+      0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012,
+      0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, 0.0019, 0, 0.0001,
+      0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009,
+      0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017,
+      0.0018, 0.0019
    }
 }
 }
diff --git a/tools/testfiles/tdset.dmp b/tools/testfiles/tdset.dmp
index 2bad835803..2f99ad586f 100644
--- a/tools/testfiles/tdset.dmp
+++ b/tools/testfiles/tdset.dmp
@@ -4,10 +4,13 @@ File name: testfiles/tdset.hdf
 Vgroup:0
      tag = 1965; reference = 2;
      name = /; class = HDF5;
-     number of entries = 0;
+     number of entries = 2;
    number of attributes = 0 
 Entries:-
-     None.
+     #0 (Numeric Data Group)
+	tag = 720; reference = 3;
+     #1 (Numeric Data Group)
+	tag = 720; reference = 5;
 
 
 Vgroup:1
@@ -163,7 +166,8 @@ Entries:-
 Graphical representation of the file:-
 (vg#: vgroup;   vd: vdata)
 
-   vg0 
+   vg0 	-- Numeric Data Group  
+	-- Numeric Data Group  
 
    vg1 	-- vd  
 
@@ -252,7 +256,7 @@ Vdata: 3
 - field index 0: [Values], type=24, order=1
    number of attributes = 0 
 Loc.     Data
-0        10  ; 
+0        20  ; 
 
 File name: testfiles/tdset.hdf 
 
@@ -305,69 +309,129 @@ Variable Name = dset2
 		 Scale Type = number-type not set
 		 Number of attributes = 0
 	 Dim1: Name=fakeDim3
-		 Size = 10
+		 Size = 20
 		 Scale Type = number-type not set
 		 Number of attributes = 0
 	 Data : 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
-                0.000000 1.000000 2.000000 3.000000 4.000000 5.000000 
-                6.000000 7.000000 8.000000 9.000000 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
+                0.000000 0.000100 0.000200 0.000300 0.000400 0.000500 
+                0.000600 0.000700 0.000800 0.000900 0.001000 0.001100 
+                0.001200 0.001300 0.001400 0.001500 0.001600 0.001700 
+                0.001800 0.001900 
                 
                 
diff --git a/tools/testfiles/tdset.h5 b/tools/testfiles/tdset.h5
index a35040c299..9f01348da0 100644
Binary files a/tools/testfiles/tdset.h5 and b/tools/testfiles/tdset.h5 differ
diff --git a/tools/testfiles/tdset2.dmp b/tools/testfiles/tdset2.dmp
index 58c1601f9b..cf4a7a0e25 100644
--- a/tools/testfiles/tdset2.dmp
+++ b/tools/testfiles/tdset2.dmp
@@ -4,10 +4,13 @@ File name: testfiles/tdset2.hdf
 Vgroup:0
      tag = 1965; reference = 2;
      name = /; class = HDF5;
-     number of entries = 0;
+     number of entries = 2;
    number of attributes = 0 
 Entries:-
-     None.
+     #0 (Numeric Data Group)
+	tag = 720; reference = 3;
+     #1 (Numeric Data Group)
+	tag = 720; reference = 5;
 
 
 Vgroup:1
@@ -163,7 +166,8 @@ Entries:-
 Graphical representation of the file:-
 (vg#: vgroup;   vd: vdata)
 
-   vg0 
+   vg0 	-- Numeric Data Group  
+	-- Numeric Data Group  
 
    vg1 	-- vd  
 
diff --git a/tools/testfiles/tdset2.h5 b/tools/testfiles/tdset2.h5
index fc1bcaa4a9..1ae7636373 100644
Binary files a/tools/testfiles/tdset2.h5 and b/tools/testfiles/tdset2.h5 differ
diff --git a/tools/testfiles/thlink-1.ddl b/tools/testfiles/thlink-1.ddl
index 43f8f3a156..7bf0a3a8d6 100644
--- a/tools/testfiles/thlink-1.ddl
+++ b/tools/testfiles/thlink-1.ddl
@@ -3,7 +3,7 @@ Expected output for 'h5dump thlink.h5'
 #############################
 HDF5 "thlink.h5" {
 GROUP "/" {
-   DATASET "dset" {
+   DATASET "dset1" {
       DATATYPE { "H5T_STD_I32BE" }
       DATASPACE { ARRAY ( 5 ) ( 5 ) }
       DATA {
@@ -11,17 +11,17 @@ GROUP "/" {
       }
    }
    GROUP "g1" {
-      GROUP "link1" {
-         DATASET "link3" {
-            HARDLINK { "/dset" }
-         }
+      DATASET "dset2" {
+         HARDLINK { "/dset1" }
       }
-      DATASET "link2" {
-         HARDLINK { "/dset" }
+      GROUP "g1.1" {
+         DATASET "dset3" {
+            HARDLINK { "/dset1" }
+         }
       }
    }
    GROUP "g2" {
-      HARDLINK { "/g1/link1" }
+      HARDLINK { "/g1/g1.1" }
    }
 }
 }
diff --git a/tools/testfiles/thlink-2.ddl b/tools/testfiles/thlink-2.ddl
index fcf85e91b2..d11b381aca 100644
--- a/tools/testfiles/thlink-2.ddl
+++ b/tools/testfiles/thlink-2.ddl
@@ -3,16 +3,12 @@ Expected output for 'h5dump -d /g1/link2 /dset /g1/link1/link3 thlink.h5'
 #############################
 HDF5 "thlink.h5" {
 DATASET "/g1/link2" {
-   DATATYPE { "H5T_STD_I32BE" }
-   DATASPACE { ARRAY ( 5 ) ( 5 ) }
-   DATA {
-      0, 1, 2, 3, 4
-   }
+   h5dump error: unable to open /g1/link2
 }
 DATASET "/dset" {
-   HARDLINK { "/g1/link2" }
+   h5dump error: unable to open /dset
 }
 DATASET "/g1/link1/link3" {
-   HARDLINK { "/g1/link2" }
+   h5dump error: unable to open /g1/link1/link3
 }
 }
diff --git a/tools/testfiles/thlink-3.ddl b/tools/testfiles/thlink-3.ddl
index 55222442f0..ab18d9479a 100644
--- a/tools/testfiles/thlink-3.ddl
+++ b/tools/testfiles/thlink-3.ddl
@@ -3,16 +3,12 @@ Expected output for 'h5dump -d /dset /g1/link1/link3 /g1/link2 thlink.h5'
 #############################
 HDF5 "thlink.h5" {
 DATASET "/dset" {
-   DATATYPE { "H5T_STD_I32BE" }
-   DATASPACE { ARRAY ( 5 ) ( 5 ) }
-   DATA {
-      0, 1, 2, 3, 4
-   }
+   h5dump error: unable to open /dset
 }
 DATASET "/g1/link1/link3" {
-   HARDLINK { "/dset" }
+   h5dump error: unable to open /g1/link1/link3
 }
 DATASET "/g1/link2" {
-   HARDLINK { "/dset" }
+   h5dump error: unable to open /g1/link2
 }
 }
diff --git a/tools/testfiles/thlink-4.ddl b/tools/testfiles/thlink-4.ddl
index bbdd723f68..669e8e9eb6 100644
--- a/tools/testfiles/thlink-4.ddl
+++ b/tools/testfiles/thlink-4.ddl
@@ -3,17 +3,17 @@ Expected output for 'h5dump -g /g1 thlink.h5'
 #############################
 HDF5 "thlink.h5" {
 GROUP "/g1" {
-   GROUP "link1" {
-      DATASET "link3" {
-         DATATYPE { "H5T_STD_I32BE" }
-         DATASPACE { ARRAY ( 5 ) ( 5 ) }
-         DATA {
-            0, 1, 2, 3, 4
-         }
+   DATASET "dset2" {
+      DATATYPE { "H5T_STD_I32BE" }
+      DATASPACE { ARRAY ( 5 ) ( 5 ) }
+      DATA {
+         0, 1, 2, 3, 4
       }
    }
-   DATASET "link2" {
-      HARDLINK { "/g1/link1/link3" }
+   GROUP "g1.1" {
+      DATASET "dset3" {
+         HARDLINK { "/g1/dset2" }
+      }
    }
 }
 }
diff --git a/tools/testfiles/thlink-5.ddl b/tools/testfiles/thlink-5.ddl
index 14277ccabf..9961862631 100644
--- a/tools/testfiles/thlink-5.ddl
+++ b/tools/testfiles/thlink-5.ddl
@@ -3,18 +3,18 @@ Expected output for 'h5dump -d /dset -g /g2 -d /g1/link2 thlink.h5'
 #############################
 HDF5 "thlink.h5" {
 DATASET "/dset" {
-   DATATYPE { "H5T_STD_I32BE" }
-   DATASPACE { ARRAY ( 5 ) ( 5 ) }
-   DATA {
-      0, 1, 2, 3, 4
-   }
+   h5dump error: unable to open /dset
 }
 GROUP "/g2" {
-   DATASET "link3" {
-      HARDLINK { "/dset" }
+   DATASET "dset3" {
+      DATATYPE { "H5T_STD_I32BE" }
+      DATASPACE { ARRAY ( 5 ) ( 5 ) }
+      DATA {
+         0, 1, 2, 3, 4
+      }
    }
 }
 DATASET "/g1/link2" {
-   HARDLINK { "/dset" }
+   h5dump error: unable to open /g1/link2
 }
 }
diff --git a/tools/testfiles/thlink.dmp b/tools/testfiles/thlink.dmp
index 74063b118c..8f0f34f664 100644
--- a/tools/testfiles/thlink.dmp
+++ b/tools/testfiles/thlink.dmp
@@ -4,60 +4,56 @@ File name: testfiles/thlink.hdf
 Vgroup:0
      tag = 1965; reference = 2;
      name = /; class = HDF5;
-     number of entries = 2;
+     number of entries = 3;
    number of attributes = 0 
 Entries:-
-     #0 (Vgroup)
+     #0 (Numeric Data Group)
+	tag = 720; reference = 3;
+     #1 (Vgroup)
 	tag = 1965;reference = 5;
-	number of entries = 1;
+	number of entries = 2;
 	name = g1; class = HDF5
    number of attributes = 0 
-     #1 (Vgroup)
-	tag = 1965;reference = 11;
-	number of entries = 0;
-	name = g2; class = HDF5
+     #2 (Vgroup)
+	tag = 1965;reference = 6;
+	number of entries = 1;
+	name = g1.1; class = HDF5
    number of attributes = 0 
 
 
 Vgroup:1
      tag = 1965; reference = 5;
      name = g1; class = HDF5;
-     number of entries = 1;
+     number of entries = 2;
    number of attributes = 0 
 Entries:-
-     #0 (Vgroup)
+     #0 (Numeric Data Group)
+	tag = 720; reference = 3;
+     #1 (Vgroup)
 	tag = 1965;reference = 6;
-	number of entries = 0;
-	name = link1; class = HDF5
+	number of entries = 1;
+	name = g1.1; class = HDF5
    number of attributes = 0 
 
 
 Vgroup:2
      tag = 1965; reference = 6;
-     name = link1; class = HDF5;
-     number of entries = 0;
+     name = g1.1; class = HDF5;
+     number of entries = 1;
    number of attributes = 0 
 Entries:-
-     None.
+     #0 (Numeric Data Group)
+	tag = 720; reference = 3;
 
 
 Vgroup:3
-     tag = 1965; reference = 11;
-     name = g2; class = HDF5;
-     number of entries = 0;
-   number of attributes = 0 
-Entries:-
-     None.
-
-
-Vgroup:4
-     tag = 1965; reference = 15;
+     tag = 1965; reference = 8;
      name = fakeDim0; class = Dim0.0;
      number of entries = 1;
    number of attributes = 0 
 Entries:-
      #0 (Vdata)
-	tag = 1962; reference = 14; 
+	tag = 1962; reference = 7; 
 	number of records = 1; interlace = 0;
 	fields = [Values];
 	record size (in bytes) = 4;
@@ -65,247 +61,68 @@ Entries:-
 	total number of attributes = 0.
 
 
-Vgroup:5
-     tag = 1965; reference = 17;
-     name = fakeDim1; class = Dim0.0;
-     number of entries = 1;
-   number of attributes = 0 
-Entries:-
-     #0 (Vdata)
-	tag = 1962; reference = 16; 
-	number of records = 1; interlace = 0;
-	fields = [Values];
-	record size (in bytes) = 4;
-	name = fakeDim1; class = DimVal0.1;
-	total number of attributes = 0.
-
-
-Vgroup:6
-     tag = 1965; reference = 19;
-     name = fakeDim2; class = Dim0.0;
-     number of entries = 1;
-   number of attributes = 0 
-Entries:-
-     #0 (Vdata)
-	tag = 1962; reference = 18; 
-	number of records = 1; interlace = 0;
-	fields = [Values];
-	record size (in bytes) = 4;
-	name = fakeDim2; class = DimVal0.1;
-	total number of attributes = 0.
-
-
-Vgroup:7
-     tag = 1965; reference = 21;
-     name = fakeDim3; class = Dim0.0;
-     number of entries = 1;
-   number of attributes = 0 
-Entries:-
-     #0 (Vdata)
-	tag = 1962; reference = 20; 
-	number of records = 1; interlace = 0;
-	fields = [Values];
-	record size (in bytes) = 4;
-	name = fakeDim3; class = DimVal0.1;
-	total number of attributes = 0.
-
-
-Vgroup:8
-     tag = 1965; reference = 23;
-     name = dset; class = Var0.0;
+Vgroup:4
+     tag = 1965; reference = 10;
+     name = dset1; class = Var0.0;
      number of entries = 5;
    number of attributes = 0 
 Entries:-
      #0 (Vgroup)
-	tag = 1965;reference = 15;
+	tag = 1965;reference = 8;
 	number of entries = 1;
 	name = fakeDim0; class = Dim0.0
    number of attributes = 0 
      #1 (Scientific Data)
 	tag = 702; reference = 4;
      #2 (Number type)
-	tag = 106; reference = 22;
+	tag = 106; reference = 9;
      #3 (SciData dimension record)
-	tag = 701; reference = 22;
+	tag = 701; reference = 9;
      #4 (Numeric Data Group)
 	tag = 720; reference = 3;
 
 
-Vgroup:9
-     tag = 1965; reference = 25;
-     name = link3; class = Var0.0;
-     number of entries = 5;
-   number of attributes = 0 
-Entries:-
-     #0 (Vgroup)
-	tag = 1965;reference = 17;
-	number of entries = 1;
-	name = fakeDim1; class = Dim0.0
-   number of attributes = 0 
-     #1 (Scientific Data)
-	tag = 702; reference = 8;
-     #2 (Number type)
-	tag = 106; reference = 24;
-     #3 (SciData dimension record)
-	tag = 701; reference = 24;
-     #4 (Numeric Data Group)
-	tag = 720; reference = 7;
-
-
-Vgroup:10
-     tag = 1965; reference = 27;
-     name = link2; class = Var0.0;
-     number of entries = 5;
-   number of attributes = 0 
-Entries:-
-     #0 (Vgroup)
-	tag = 1965;reference = 19;
-	number of entries = 1;
-	name = fakeDim2; class = Dim0.0
-   number of attributes = 0 
-     #1 (Scientific Data)
-	tag = 702; reference = 10;
-     #2 (Number type)
-	tag = 106; reference = 26;
-     #3 (SciData dimension record)
-	tag = 701; reference = 26;
-     #4 (Numeric Data Group)
-	tag = 720; reference = 9;
-
-
-Vgroup:11
-     tag = 1965; reference = 29;
-     name = link3; class = Var0.0;
-     number of entries = 5;
-   number of attributes = 0 
-Entries:-
-     #0 (Vgroup)
-	tag = 1965;reference = 21;
-	number of entries = 1;
-	name = fakeDim3; class = Dim0.0
-   number of attributes = 0 
-     #1 (Scientific Data)
-	tag = 702; reference = 13;
-     #2 (Number type)
-	tag = 106; reference = 28;
-     #3 (SciData dimension record)
-	tag = 701; reference = 28;
-     #4 (Numeric Data Group)
-	tag = 720; reference = 12;
-
-
-Vgroup:12
-     tag = 1965; reference = 30;
+Vgroup:5
+     tag = 1965; reference = 11;
      name = thlink.hdf; class = CDF0.0;
-     number of entries = 8;
+     number of entries = 2;
    number of attributes = 0 
 Entries:-
      #0 (Vgroup)
-	tag = 1965;reference = 15;
+	tag = 1965;reference = 8;
 	number of entries = 1;
 	name = fakeDim0; class = Dim0.0
    number of attributes = 0 
      #1 (Vgroup)
-	tag = 1965;reference = 17;
-	number of entries = 1;
-	name = fakeDim1; class = Dim0.0
-   number of attributes = 0 
-     #2 (Vgroup)
-	tag = 1965;reference = 19;
-	number of entries = 1;
-	name = fakeDim2; class = Dim0.0
-   number of attributes = 0 
-     #3 (Vgroup)
-	tag = 1965;reference = 21;
-	number of entries = 1;
-	name = fakeDim3; class = Dim0.0
-   number of attributes = 0 
-     #4 (Vgroup)
-	tag = 1965;reference = 23;
+	tag = 1965;reference = 10;
 	number of entries = 5;
-	name = dset; class = Var0.0
-   number of attributes = 0 
-     #5 (Vgroup)
-	tag = 1965;reference = 25;
-	number of entries = 5;
-	name = link3; class = Var0.0
-   number of attributes = 0 
-     #6 (Vgroup)
-	tag = 1965;reference = 27;
-	number of entries = 5;
-	name = link2; class = Var0.0
-   number of attributes = 0 
-     #7 (Vgroup)
-	tag = 1965;reference = 29;
-	number of entries = 5;
-	name = link3; class = Var0.0
+	name = dset1; class = Var0.0
    number of attributes = 0 
 
 
 Graphical representation of the file:-
 (vg#: vgroup;   vd: vdata)
 
-   vg0 	-- vg1 	-- vg2 
-	-- vg3 
+   vg0 	-- Numeric Data Group  
+	-- vg1 	-- Numeric Data Group  
+		-- vg2 	-- Numeric Data Group  
+	-- vg2 	-- Numeric Data Group  
 
-   vg1 	-- vg2 
+   vg1 	-- Numeric Data Group  
+	-- vg2 	-- Numeric Data Group  
 
-   vg2 
+   vg2 	-- Numeric Data Group  
 
-   vg3 
+   vg3 	-- vd  
 
-   vg4 	-- vd  
-
-   vg5 	-- vd  
-
-   vg6 	-- vd  
-
-   vg7 	-- vd  
-
-   vg8 	-- vg4 	-- vd  
+   vg4 	-- vg3 	-- vd  
 	-- Scientific Data  
 	-- Number type  
 	-- SciData dimension record  
 	-- Numeric Data Group  
 
-   vg9 	-- vg5 	-- vd  
-	-- Scientific Data  
-	-- Number type  
-	-- SciData dimension record  
-	-- Numeric Data Group  
-
-   vg10 	-- vg6 	-- vd  
-	-- Scientific Data  
-	-- Number type  
-	-- SciData dimension record  
-	-- Numeric Data Group  
-
-   vg11 	-- vg7 	-- vd  
-	-- Scientific Data  
-	-- Number type  
-	-- SciData dimension record  
-	-- Numeric Data Group  
-
-   vg12 	-- vg4 	-- vd  
-	-- vg5 	-- vd  
-	-- vg6 	-- vd  
-	-- vg7 	-- vd  
-	-- vg8 	-- vg4 	-- vd  
-		-- Scientific Data  
-		-- Number type  
-		-- SciData dimension record  
-		-- Numeric Data Group  
-	-- vg9 	-- vg5 	-- vd  
-		-- Scientific Data  
-		-- Number type  
-		-- SciData dimension record  
-		-- Numeric Data Group  
-	-- vg10 	-- vg6 	-- vd  
-		-- Scientific Data  
-		-- Number type  
-		-- SciData dimension record  
-		-- Numeric Data Group  
-	-- vg9 	-- vg5 	-- vd  
+   vg5 	-- vg3 	-- vd  
+	-- vg4 	-- vg3 	-- vd  
 		-- Scientific Data  
 		-- Number type  
 		-- SciData dimension record  
@@ -314,7 +131,7 @@ Graphical representation of the file:-
 File name: testfiles/thlink.hdf 
 
 Vdata: 0
-   tag = 1962; reference = 14;
+   tag = 1962; reference = 7;
    number of records = 1; interlace = 0;
    fields = [Values];
    record size (in bytes) = 4;
@@ -325,45 +142,9 @@ Vdata: 0
 Loc.     Data
 0        5  ; 
 
-Vdata: 1
-   tag = 1962; reference = 16;
-   number of records = 1; interlace = 0;
-   fields = [Values];
-   record size (in bytes) = 4;
-   name = fakeDim1; class = DimVal0.1;
-   number of attributes = 0 
-- field index 0: [Values], type=24, order=1
-   number of attributes = 0 
-Loc.     Data
-0        5  ; 
-
-Vdata: 2
-   tag = 1962; reference = 18;
-   number of records = 1; interlace = 0;
-   fields = [Values];
-   record size (in bytes) = 4;
-   name = fakeDim2; class = DimVal0.1;
-   number of attributes = 0 
-- field index 0: [Values], type=24, order=1
-   number of attributes = 0 
-Loc.     Data
-0        5  ; 
-
-Vdata: 3
-   tag = 1962; reference = 20;
-   number of records = 1; interlace = 0;
-   fields = [Values];
-   record size (in bytes) = 4;
-   name = fakeDim3; class = DimVal0.1;
-   number of attributes = 0 
-- field index 0: [Values], type=24, order=1
-   number of attributes = 0 
-Loc.     Data
-0        5  ; 
-
 File name: testfiles/thlink.hdf 
 
-Variable Name = dset
+Variable Name = dset1
 	 Index = 0
 	 Type= 32-bit signed integer
 	 Ref. = 3
@@ -376,45 +157,3 @@ Variable Name = dset
 	 Data : 
                 0 1 2 3 4 
 
-
-Variable Name = link3
-	 Index = 1
-	 Type= 32-bit signed integer
-	 Ref. = 7
-	 Rank = 1
-	 Number of attributes = 0
-	 Dim0: Name=fakeDim1
-		 Size = 5
-		 Scale Type = number-type not set
-		 Number of attributes = 0
-	 Data : 
-                0 1 2 3 4 
-
-
-Variable Name = link2
-	 Index = 2
-	 Type= 32-bit signed integer
-	 Ref. = 9
-	 Rank = 1
-	 Number of attributes = 0
-	 Dim0: Name=fakeDim2
-		 Size = 5
-		 Scale Type = number-type not set
-		 Number of attributes = 0
-	 Data : 
-                0 1 2 3 4 
-
-
-Variable Name = link3
-	 Index = 3
-	 Type= 32-bit signed integer
-	 Ref. = 12
-	 Rank = 1
-	 Number of attributes = 0
-	 Dim0: Name=fakeDim3
-		 Size = 5
-		 Scale Type = number-type not set
-		 Number of attributes = 0
-	 Data : 
-                0 1 2 3 4 
-
diff --git a/tools/testfiles/thlink.h5 b/tools/testfiles/thlink.h5
index 49ebeb550b..e5144029f0 100644
Binary files a/tools/testfiles/thlink.h5 and b/tools/testfiles/thlink.h5 differ
diff --git a/tools/testfiles/tloop.h5 b/tools/testfiles/tloop.h5
new file mode 100644
index 0000000000..12390fd659
Binary files /dev/null and b/tools/testfiles/tloop.h5 differ
diff --git a/tools/testfiles/tloop2.h5 b/tools/testfiles/tloop2.h5
new file mode 100644
index 0000000000..c54411e975
Binary files /dev/null and b/tools/testfiles/tloop2.h5 differ
diff --git a/tools/testfiles/tmany.dmp b/tools/testfiles/tmany.dmp
new file mode 100644
index 0000000000..b9ba9cd251
--- /dev/null
+++ b/tools/testfiles/tmany.dmp
@@ -0,0 +1,533 @@
+File name: testfiles/tmany.hdf 
+
+
+Vgroup:0
+     tag = 1965; reference = 2;
+     name = /; class = HDF5;
+     number of entries = 6;
+   number of attributes = 0 
+Entries:-
+     #0 (Vgroup)
+	tag = 1965;reference = 3;
+	number of entries = 2;
+	name = g1; class = HDF5
+   number of attributes = 0 
+     #1 (Vgroup)
+	tag = 1965;reference = 10;
+	number of entries = 1;
+	name = g2; class = HDF5
+   number of attributes = 0 
+     #2 (Vgroup)
+	tag = 1965;reference = 11;
+	number of entries = 1;
+	name = g3; class = HDF5
+   number of attributes = 0 
+     #3 (Vgroup)
+	tag = 1965;reference = 14;
+	number of entries = 1;
+	name = g4; class = HDF5
+   number of attributes = 0 
+     #4 (Vgroup)
+	tag = 1965;reference = 15;
+	number of entries = 1;
+	name = g5; class = HDF5
+   number of attributes = 0 
+     #5 (Vgroup)
+	tag = 1965;reference = 18;
+	number of entries = 1;
+	name = g6; class = HDF5
+   number of attributes = 0 
+
+
+Vgroup:1
+     tag = 1965; reference = 3;
+     name = g1; class = HDF5;
+     number of entries = 2;
+   number of attributes = 0 
+Entries:-
+     #0 (Vgroup)
+	tag = 1965;reference = 4;
+	number of entries = 1;
+	name = g1.1; class = HDF5
+   number of attributes = 0 
+     #1 (Vgroup)
+	tag = 1965;reference = 9;
+	number of entries = 1;
+	name = g1.2; class = HDF5
+   number of attributes = 0 
+
+
+Vgroup:2
+     tag = 1965; reference = 4;
+     name = g1.1; class = HDF5;
+     number of entries = 1;
+   number of attributes = 0 
+Entries:-
+     #0 (Vdata)
+	tag = 1962; reference = 5; 
+	number of records = 6; interlace = 0;
+	fields = [a_array, b_array, c_array];
+	record size (in bytes) = 320;
+	name = dset1; class = HDF5;
+	total number of attributes = 3.
+
+
+Vgroup:3
+     tag = 1965; reference = 9;
+     name = g1.2; class = HDF5;
+     number of entries = 1;
+   number of attributes = 0 
+Entries:-
+     #0 (Vdata)
+	tag = 1962; reference = 5; 
+	number of records = 6; interlace = 0;
+	fields = [a_array, b_array, c_array];
+	record size (in bytes) = 320;
+	name = dset1; class = HDF5;
+	total number of attributes = 3.
+
+
+Vgroup:4
+     tag = 1965; reference = 10;
+     name = g2; class = HDF5;
+     number of entries = 1;
+   number of attributes = 0 
+Entries:-
+     #0 (Vgroup)
+	tag = 1965;reference = 3;
+	number of entries = 2;
+	name = g1; class = HDF5
+   number of attributes = 0 
+
+
+Vgroup:5
+     tag = 1965; reference = 11;
+     name = g3; class = HDF5;
+     number of entries = 1;
+   number of attributes = 0 
+Entries:-
+     #0 (Numeric Data Group)
+	tag = 720; reference = 12;
+
+
+Vgroup:6
+     tag = 1965; reference = 14;
+     name = g4; class = HDF5;
+     number of entries = 1;
+   number of attributes = 0 
+Entries:-
+     #0 (Numeric Data Group)
+	tag = 720; reference = 12;
+
+
+Vgroup:7
+     tag = 1965; reference = 15;
+     name = g5; class = HDF5;
+     number of entries = 1;
+   number of attributes = 0 
+Entries:-
+     #0 (Numeric Data Group)
+	tag = 720; reference = 16;
+
+
+Vgroup:8
+     tag = 1965; reference = 18;
+     name = g6; class = HDF5;
+     number of entries = 1;
+   number of attributes = 0 
+Entries:-
+     #0 (Numeric Data Group)
+	tag = 720; reference = 16;
+
+
+Vgroup:9
+     tag = 1965; reference = 20;
+     name = fakeDim0; class = Dim0.0;
+     number of entries = 1;
+   number of attributes = 0 
+Entries:-
+     #0 (Vdata)
+	tag = 1962; reference = 19; 
+	number of records = 1; interlace = 0;
+	fields = [Values];
+	record size (in bytes) = 4;
+	name = fakeDim0; class = DimVal0.1;
+	total number of attributes = 0.
+
+
+Vgroup:10
+     tag = 1965; reference = 22;
+     name = fakeDim1; class = Dim0.0;
+     number of entries = 1;
+   number of attributes = 0 
+Entries:-
+     #0 (Vdata)
+	tag = 1962; reference = 21; 
+	number of records = 1; interlace = 0;
+	fields = [Values];
+	record size (in bytes) = 4;
+	name = fakeDim1; class = DimVal0.1;
+	total number of attributes = 0.
+
+
+Vgroup:11
+     tag = 1965; reference = 24;
+     name = fakeDim2; class = Dim0.0;
+     number of entries = 1;
+   number of attributes = 0 
+Entries:-
+     #0 (Vdata)
+	tag = 1962; reference = 23; 
+	number of records = 1; interlace = 0;
+	fields = [Values];
+	record size (in bytes) = 4;
+	name = fakeDim2; class = DimVal0.1;
+	total number of attributes = 0.
+
+
+Vgroup:12
+     tag = 1965; reference = 26;
+     name = fakeDim3; class = Dim0.0;
+     number of entries = 1;
+   number of attributes = 0 
+Entries:-
+     #0 (Vdata)
+	tag = 1962; reference = 25; 
+	number of records = 1; interlace = 0;
+	fields = [Values];
+	record size (in bytes) = 4;
+	name = fakeDim3; class = DimVal0.1;
+	total number of attributes = 0.
+
+
+Vgroup:13
+     tag = 1965; reference = 28;
+     name = link3; class = Var0.0;
+     number of entries = 6;
+   number of attributes = 0 
+Entries:-
+     #0 (Vgroup)
+	tag = 1965;reference = 20;
+	number of entries = 1;
+	name = fakeDim0; class = Dim0.0
+   number of attributes = 0 
+     #1 (Vgroup)
+	tag = 1965;reference = 22;
+	number of entries = 1;
+	name = fakeDim1; class = Dim0.0
+   number of attributes = 0 
+     #2 (Scientific Data)
+	tag = 702; reference = 13;
+     #3 (Number type)
+	tag = 106; reference = 27;
+     #4 (SciData dimension record)
+	tag = 701; reference = 27;
+     #5 (Numeric Data Group)
+	tag = 720; reference = 12;
+
+
+Vgroup:14
+     tag = 1965; reference = 30;
+     name = slink4; class = Var0.0;
+     number of entries = 6;
+   number of attributes = 0 
+Entries:-
+     #0 (Vgroup)
+	tag = 1965;reference = 24;
+	number of entries = 1;
+	name = fakeDim2; class = Dim0.0
+   number of attributes = 0 
+     #1 (Vgroup)
+	tag = 1965;reference = 26;
+	number of entries = 1;
+	name = fakeDim3; class = Dim0.0
+   number of attributes = 0 
+     #2 (Scientific Data)
+	tag = 702; reference = 17;
+     #3 (Number type)
+	tag = 106; reference = 29;
+     #4 (SciData dimension record)
+	tag = 701; reference = 29;
+     #5 (Numeric Data Group)
+	tag = 720; reference = 16;
+
+
+Vgroup:15
+     tag = 1965; reference = 31;
+     name = tmany.hdf; class = CDF0.0;
+     number of entries = 6;
+   number of attributes = 0 
+Entries:-
+     #0 (Vgroup)
+	tag = 1965;reference = 20;
+	number of entries = 1;
+	name = fakeDim0; class = Dim0.0
+   number of attributes = 0 
+     #1 (Vgroup)
+	tag = 1965;reference = 22;
+	number of entries = 1;
+	name = fakeDim1; class = Dim0.0
+   number of attributes = 0 
+     #2 (Vgroup)
+	tag = 1965;reference = 24;
+	number of entries = 1;
+	name = fakeDim2; class = Dim0.0
+   number of attributes = 0 
+     #3 (Vgroup)
+	tag = 1965;reference = 26;
+	number of entries = 1;
+	name = fakeDim3; class = Dim0.0
+   number of attributes = 0 
+     #4 (Vgroup)
+	tag = 1965;reference = 28;
+	number of entries = 6;
+	name = link3; class = Var0.0
+   number of attributes = 0 
+     #5 (Vgroup)
+	tag = 1965;reference = 30;
+	number of entries = 6;
+	name = slink4; class = Var0.0
+   number of attributes = 0 
+
+
+Graphical representation of the file:-
+(vg#: vgroup;   vd: vdata)
+
+   vg0 	-- vg1 	-- vg2 	-- vd  
+		-- vg3 	-- vd  
+	-- vg4 	-- vg1 	-- vg2 	-- vd  
+			-- vg3 	-- vd  
+	-- vg5 	-- Numeric Data Group  
+	-- vg6 	-- Numeric Data Group  
+	-- vg7 	-- Numeric Data Group  
+	-- vg8 	-- Numeric Data Group  
+
+   vg1 	-- vg2 	-- vd  
+	-- vg3 	-- vd  
+
+   vg2 	-- vd  
+
+   vg3 	-- vd  
+
+   vg4 	-- vg1 	-- vg2 	-- vd  
+		-- vg3 	-- vd  
+
+   vg5 	-- Numeric Data Group  
+
+   vg6 	-- Numeric Data Group  
+
+   vg7 	-- Numeric Data Group  
+
+   vg8 	-- Numeric Data Group  
+
+   vg9 	-- vd  
+
+   vg10 	-- vd  
+
+   vg11 	-- vd  
+
+   vg12 	-- vd  
+
+   vg13 	-- vg9 	-- vd  
+	-- vg10 	-- vd  
+	-- Scientific Data  
+	-- Number type  
+	-- SciData dimension record  
+	-- Numeric Data Group  
+
+   vg14 	-- vg11 	-- vd  
+	-- vg12 	-- vd  
+	-- Scientific Data  
+	-- Number type  
+	-- SciData dimension record  
+	-- Numeric Data Group  
+
+   vg15 	-- vg9 	-- vd  
+	-- vg10 	-- vd  
+	-- vg11 	-- vd  
+	-- vg12 	-- vd  
+	-- vg13 	-- vg9 	-- vd  
+		-- vg10 	-- vd  
+		-- Scientific Data  
+		-- Number type  
+		-- SciData dimension record  
+		-- Numeric Data Group  
+	-- vg14 	-- vg11 	-- vd  
+		-- vg12 	-- vd  
+		-- Scientific Data  
+		-- Number type  
+		-- SciData dimension record  
+		-- Numeric Data Group  
+
+File name: testfiles/tmany.hdf 
+
+Vdata: 0
+   tag = 1962; reference = 5;
+   number of records = 6; interlace = 0;
+   fields = [a_array, b_array, c_array];
+   record size (in bytes) = 320;
+   name = dset1; class = HDF5;
+   number of attributes = 3 
+    attr0: name=attr1 type=20 count=10 size=10
+	97 98 99 100 101 102 103 104 105 0 
+    attr1: name=attr2 type=24 count=4 size=16
+	0 1 2 3 
+    attr2: name=attr3 type=6 count=10 size=80
+	0.000000 0.100000 0.200000 0.300000 0.400000 0.500000 0.600000 
+	0.700000 0.800000 0.900000 
+- field index 0: [a_array], type=24, order=16
+   number of attributes = 0 
+- field index 1: [b_array], type=6, order=16
+   number of attributes = 0 
+- field index 2: [c_array], type=6, order=16
+   number of attributes = 0 
+Loc.     Data
+0        0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1  0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000  6.000000 7.000000 6.000000 7.000000 6.000000 7.000000 6.000000 7.000000 6.000000 7.000000 6.000000 7.000000 6.000000 7.000000 6.000000 7.000000  ; 
+1        1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2  1.000000 2.000000 1.000000 2.000000 1.000000 2.000000 1.000000 2.000000 1.000000 2.000000 1.000000 2.000000 1.000000 2.000000 1.000000 2.000000  7.000000 8.000000 7.000000 8.000000 7.000000 8.000000 7.000000 8.000000 7.000000 8.000000 7.000000 8.000000 7.000000 8.000000 7.000000 8.000000  ; 
+2        2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3  2.000000 3.000000 2.000000 3.000000 2.000000 3.000000 2.000000 3.000000 2.000000 3.000000 2.000000 3.000000 2.000000 3.000000 2.000000 3.000000  8.000000 9.000000 8.000000 9.000000 8.000000 9.000000 8.000000 9.000000 8.000000 9.000000 8.000000 9.000000 8.000000 9.000000 8.000000 9.000000  ; 
+3        3 4 3 4 3 4 3 4 3 4 3 4 3 4 3 4  3.000000 4.000000 3.000000 4.000000 3.000000 4.000000 3.000000 4.000000 3.000000 4.000000 3.000000 4.000000 3.000000 4.000000 3.000000 4.000000  9.000000 10.000000 9.000000 10.000000 9.000000 10.000000 9.000000 10.000000 9.000000 10.000000 9.000000 10.000000 9.000000 10.000000 9.000000 10.000000  ; 
+4        4 5 4 5 4 5 4 5 4 5 4 5 4 5 4 5  4.000000 5.000000 4.000000 5.000000 4.000000 5.000000 4.000000 5.000000 4.000000 5.000000 4.000000 5.000000 4.000000 5.000000 4.000000 5.000000  10.000000 11.000000 10.000000 11.000000 10.000000 11.000000 10.000000 11.000000 10.000000 11.000000 10.000000 11.000000 10.000000 11.000000 10.000000 11.000000  ; 
+5        5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6  5.000000 6.000000 5.000000 6.000000 5.000000 6.000000 5.000000 6.000000 5.000000 6.000000 5.000000 6.000000 5.000000 6.000000 5.000000 6.000000  11.000000 12.000000 11.000000 12.000000 11.000000 12.000000 11.000000 12.000000 11.000000 12.000000 11.000000 12.000000 11.000000 12.000000 11.000000 12.000000  ; 
+
+
+Vdata: 1
+   tag = 1962; reference = 6;
+   number of records = 1; interlace = 0;
+   fields = [VALUES];
+   record size (in bytes) = 10;
+   name = attr1; class = Attr0.0;
+   number of attributes = 0 
+- field index 0: [VALUES], type=20, order=10
+   number of attributes = 0 
+Loc.     Data
+0        97 98 99 100 101 102 103 104 105 0  ; 
+
+Vdata: 2
+   tag = 1962; reference = 7;
+   number of records = 1; interlace = 0;
+   fields = [VALUES];
+   record size (in bytes) = 16;
+   name = attr2; class = Attr0.0;
+   number of attributes = 0 
+- field index 0: [VALUES], type=24, order=4
+   number of attributes = 0 
+Loc.     Data
+0        0 1 2 3  ; 
+
+Vdata: 3
+   tag = 1962; reference = 8;
+   number of records = 1; interlace = 0;
+   fields = [VALUES];
+   record size (in bytes) = 80;
+   name = attr3; class = Attr0.0;
+   number of attributes = 0 
+- field index 0: [VALUES], type=6, order=10
+   number of attributes = 0 
+Loc.     Data
+0        0.000000 0.100000 0.200000 0.300000 0.400000 0.500000 0.600000 0.700000 0.800000 0.900000  ; 
+
+Vdata: 4
+   tag = 1962; reference = 19;
+   number of records = 1; interlace = 0;
+   fields = [Values];
+   record size (in bytes) = 4;
+   name = fakeDim0; class = DimVal0.1;
+   number of attributes = 0 
+- field index 0: [Values], type=24, order=1
+   number of attributes = 0 
+Loc.     Data
+0        10  ; 
+
+Vdata: 5
+   tag = 1962; reference = 21;
+   number of records = 1; interlace = 0;
+   fields = [Values];
+   record size (in bytes) = 4;
+   name = fakeDim1; class = DimVal0.1;
+   number of attributes = 0 
+- field index 0: [Values], type=24, order=1
+   number of attributes = 0 
+Loc.     Data
+0        10  ; 
+
+Vdata: 6
+   tag = 1962; reference = 23;
+   number of records = 1; interlace = 0;
+   fields = [Values];
+   record size (in bytes) = 4;
+   name = fakeDim2; class = DimVal0.1;
+   number of attributes = 0 
+- field index 0: [Values], type=24, order=1
+   number of attributes = 0 
+Loc.     Data
+0        10  ; 
+
+Vdata: 7
+   tag = 1962; reference = 25;
+   number of records = 1; interlace = 0;
+   fields = [Values];
+   record size (in bytes) = 4;
+   name = fakeDim3; class = DimVal0.1;
+   number of attributes = 0 
+- field index 0: [Values], type=24, order=1
+   number of attributes = 0 
+Loc.     Data
+0        10  ; 
+
+File name: testfiles/tmany.hdf 
+
+Variable Name = link3
+	 Index = 0
+	 Type= 32-bit signed integer
+	 Ref. = 12
+	 Rank = 2
+	 Number of attributes = 0
+	 Dim0: Name=fakeDim0
+		 Size = 10
+		 Scale Type = number-type not set
+		 Number of attributes = 0
+	 Dim1: Name=fakeDim1
+		 Size = 10
+		 Scale Type = number-type not set
+		 Number of attributes = 0
+	 Data : 
+                0 1 2 3 4 5 6 7 8 9 
+                0 1 2 3 4 5 6 7 8 9 
+                0 1 2 3 4 5 6 7 8 9 
+                0 1 2 3 4 5 6 7 8 9 
+                0 1 2 3 4 5 6 7 8 9 
+                0 1 2 3 4 5 6 7 8 9 
+                0 1 2 3 4 5 6 7 8 9 
+                0 1 2 3 4 5 6 7 8 9 
+                0 1 2 3 4 5 6 7 8 9 
+                0 1 2 3 4 5 6 7 8 9 
+                
+                
+
+Variable Name = slink4
+	 Index = 1
+	 Type= 32-bit signed integer
+	 Ref. = 16
+	 Rank = 2
+	 Number of attributes = 0
+	 Dim0: Name=fakeDim2
+		 Size = 10
+		 Scale Type = number-type not set
+		 Number of attributes = 0
+	 Dim1: Name=fakeDim3
+		 Size = 10
+		 Scale Type = number-type not set
+		 Number of attributes = 0
+	 Data : 
+                0 0 0 0 0 0 0 0 0 0 
+                1 1 1 1 1 1 1 1 1 1 
+                2 2 2 2 2 2 2 2 2 2 
+                3 3 3 3 3 3 3 3 3 3 
+                4 4 4 4 4 4 4 4 4 4 
+                5 5 5 5 5 5 5 5 5 5 
+                6 6 6 6 6 6 6 6 6 6 
+                7 7 7 7 7 7 7 7 7 7 
+                8 8 8 8 8 8 8 8 8 8 
+                9 9 9 9 9 9 9 9 9 9 
+                
+                
diff --git a/tools/testfiles/tmany.h5 b/tools/testfiles/tmany.h5
new file mode 100644
index 0000000000..c152f4c9fb
Binary files /dev/null and b/tools/testfiles/tmany.h5 differ