diff --git a/tools/testfiles/tcompound.h5.xml b/tools/testfiles/tcompound.h5.xml
index 3d4342a380..25db6ae013 100644
--- a/tools/testfiles/tcompound.h5.xml
+++ b/tools/testfiles/tcompound.h5.xml
@@ -5,7 +5,128 @@ Expected output for 'h5dump --xml tcompound.h5'
 <!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.dtd">
 <HDF5-File>
 <RootGroup OBJ-XID="root">
+   <NamedDataType Name="#6632:0" OBJ-XID="/#6632:0" Parents="root">
+      <CompoundType>
+         <Field FieldName="int">
+            <DataType> 
+               <AtomicType>
+                  <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+               </AtomicType>
+            </DataType>
+         </Field>
+         <Field FieldName="float">
+            <DataType> 
+               <AtomicType>
+                  <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+               </AtomicType>
+            </DataType>
+         </Field>
+      </CompoundType>
+   </NamedDataType>
+   <NamedDataType Name="type1" OBJ-XID="/type1" Parents="root">
+      <CompoundType>
+         <Field FieldName="int_name">
+            <DataType> 
+               <AtomicType>
+                  <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+               </AtomicType>
+            </DataType>
+         </Field>
+         <Field FieldName="float_name">
+            <DataType> 
+               <AtomicType>
+                  <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+               </AtomicType>
+            </DataType>
+         </Field>
+      </CompoundType>
+   </NamedDataType>
+   <NamedDataType Name="type2" OBJ-XID="/type2" Parents="root">
+      <CompoundType>
+         <Field FieldName="int_array">
+            <DataType> 
+               <ArrayType Ndims="1">
+                  <ArrayDimension DimSize="4" DimPerm="0"/>
+                  <DataType>
+                     <AtomicType>
+                        <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                     </AtomicType>
+                  </DataType>
+               </ArrayType>
+            </DataType>
+         </Field>
+         <Field FieldName="float_array">
+            <DataType> 
+               <ArrayType Ndims="2">
+                  <ArrayDimension DimSize="5" DimPerm="0"/>
+                  <ArrayDimension DimSize="6" DimPerm="1"/>
+                  <DataType>
+                     <AtomicType>
+                        <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                     </AtomicType>
+                  </DataType>
+               </ArrayType>
+            </DataType>
+         </Field>
+      </CompoundType>
+   </NamedDataType>
+   <Dataset Name="dset1" OBJ-XID="/dset1" Parents="root">
+      <Dataspace>
+         <SimpleDataspace Ndims="1">
+            <Dimension  DimSize="5" MaxDimSize="5"/>
+         </SimpleDataspace>
+      </Dataspace>
+      <DataType> 
+         <CompoundType>
+            <Field FieldName="a_name">
+               <DataType>
+                  <AtomicType>
+                     <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+            <Field FieldName="b_name">
+               <DataType>
+                  <AtomicType>
+                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+            <Field FieldName="c_name">
+               <DataType>
+                  <AtomicType>
+                     <FloatType ByteOrder="BE" Size="8" SignBitLocation="63" ExponentBits="11" ExponentLocation="52" MantissaBits="52" MantissaLocation="0" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+         </CompoundType>
+      </DataType>
+   <!-- Note: format of compound data not specified -->
+      <Data>
+         <DataFromFile>
+         0 0 1 1 1 0.5 2 4 0.333333 3 9 0.25 4 16 0.2
+         </DataFromFile>
+      </Data>
+   </Dataset>
    <Group Name="group1" OBJ-XID="/group1" Parents="/" >
+      <NamedDataType Name="type3" OBJ-XID="/group1/type3" Parents="/group1">
+         <CompoundType>
+            <Field FieldName="int">
+               <DataType> 
+                  <AtomicType>
+                     <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+            <Field FieldName="float">
+               <DataType> 
+                  <AtomicType>
+                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+         </CompoundType>
+      </NamedDataType>
       <Dataset Name="dset2" OBJ-XID="/group1/dset2" Parents="/group1">
          <Dataspace>
             <SimpleDataspace Ndims="1">
@@ -138,24 +259,6 @@ Expected output for 'h5dump --xml tcompound.h5'
             </DataFromFile>
          </Data>
       </Dataset>
-      <NamedDataType Name="type3" OBJ-XID="/group1/type3" Parents="/group1">
-         <CompoundType>
-            <Field FieldName="int">
-               <DataType> 
-                  <AtomicType>
-                     <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-            <Field FieldName="float">
-               <DataType> 
-                  <AtomicType>
-                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-         </CompoundType>
-      </NamedDataType>
    </Group>
    <Group Name="group2" OBJ-XID="/group2" Parents="/" >
       <Dataset Name="dset5" OBJ-XID="/group2/dset5" Parents="/group2">
@@ -173,108 +276,5 @@ Expected output for 'h5dump --xml tcompound.h5'
          </Data>
       </Dataset>
    </Group>
-   <Dataset Name="dset1" OBJ-XID="/dset1" Parents="root">
-      <Dataspace>
-         <SimpleDataspace Ndims="1">
-            <Dimension  DimSize="5" MaxDimSize="5"/>
-         </SimpleDataspace>
-      </Dataspace>
-      <DataType> 
-         <CompoundType>
-            <Field FieldName="a_name">
-               <DataType>
-                  <AtomicType>
-                     <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-            <Field FieldName="b_name">
-               <DataType>
-                  <AtomicType>
-                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-            <Field FieldName="c_name">
-               <DataType>
-                  <AtomicType>
-                     <FloatType ByteOrder="BE" Size="8" SignBitLocation="63" ExponentBits="11" ExponentLocation="52" MantissaBits="52" MantissaLocation="0" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-         </CompoundType>
-      </DataType>
-   <!-- Note: format of compound data not specified -->
-      <Data>
-         <DataFromFile>
-         0 0 1 1 1 0.5 2 4 0.333333 3 9 0.25 4 16 0.2
-         </DataFromFile>
-      </Data>
-   </Dataset>
-   <NamedDataType Name="#6632:0" OBJ-XID="/#6632:0" Parents="root">
-      <CompoundType>
-         <Field FieldName="int">
-            <DataType> 
-               <AtomicType>
-                  <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-               </AtomicType>
-            </DataType>
-         </Field>
-         <Field FieldName="float">
-            <DataType> 
-               <AtomicType>
-                  <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-               </AtomicType>
-            </DataType>
-         </Field>
-      </CompoundType>
-   </NamedDataType>
-   <NamedDataType Name="type1" OBJ-XID="/type1" Parents="root">
-      <CompoundType>
-         <Field FieldName="int_name">
-            <DataType> 
-               <AtomicType>
-                  <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-               </AtomicType>
-            </DataType>
-         </Field>
-         <Field FieldName="float_name">
-            <DataType> 
-               <AtomicType>
-                  <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-               </AtomicType>
-            </DataType>
-         </Field>
-      </CompoundType>
-   </NamedDataType>
-   <NamedDataType Name="type2" OBJ-XID="/type2" Parents="root">
-      <CompoundType>
-         <Field FieldName="int_array">
-            <DataType> 
-               <ArrayType Ndims="1">
-                  <ArrayDimension DimSize="4" DimPerm="0"/>
-                  <DataType>
-                     <AtomicType>
-                        <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                     </AtomicType>
-                  </DataType>
-               </ArrayType>
-            </DataType>
-         </Field>
-         <Field FieldName="float_array">
-            <DataType> 
-               <ArrayType Ndims="2">
-                  <ArrayDimension DimSize="5" DimPerm="0"/>
-                  <ArrayDimension DimSize="6" DimPerm="1"/>
-                  <DataType>
-                     <AtomicType>
-                        <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                     </AtomicType>
-                  </DataType>
-               </ArrayType>
-            </DataType>
-         </Field>
-      </CompoundType>
-   </NamedDataType>
 </RootGroup>
 </HDF5-File>
diff --git a/tools/testfiles/tcompound2.h5.xml b/tools/testfiles/tcompound2.h5.xml
index 67435c6db5..b19226ca82 100644
--- a/tools/testfiles/tcompound2.h5.xml
+++ b/tools/testfiles/tcompound2.h5.xml
@@ -5,128 +5,6 @@ Expected output for 'h5dump --xml tcompound2.h5'
 <!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.dtd">
 <HDF5-File>
 <RootGroup OBJ-XID="root">
-   <Group Name="group1" OBJ-XID="/group1" Parents="/" >
-      <Dataset Name="dset2" OBJ-XID="/group1/dset2" Parents="/group1">
-         <StorageLayout>
-            <ChunkedLayout Ndims="1">
-               <ChunkDimension DimSize="2" />
-            </ChunkedLayout>
-         </StorageLayout>
-         <Dataspace>
-            <SimpleDataspace Ndims="1">
-               <Dimension  DimSize="6" MaxDimSize="10"/>
-            </SimpleDataspace>
-         </Dataspace>
-         <NamedDataTypePtr OBJ-XID="/type1"/>
-      <!-- Note: format of compound data not specified -->
-         <Data>
-            <DataFromFile>
-            0 0 1 1.1 2 2.2 3 3.3 4 4.4 5 5.5
-            </DataFromFile>
-         </Data>
-      </Dataset>
-      <Dataset Name="dset4" OBJ-XID="/group1/dset4" Parents="/group1">
-         <StorageLayout>
-            <ChunkedLayout Ndims="1">
-               <ChunkDimension DimSize="2" />
-            </ChunkedLayout>
-         </StorageLayout>
-         <Dataspace>
-            <SimpleDataspace Ndims="1">
-               <Dimension  DimSize="6" MaxDimSize="10"/>
-            </SimpleDataspace>
-         </Dataspace>
-         <NamedDataTypePtr OBJ-XID="/group1/type3"/>
-      <!-- Note: format of compound data not specified -->
-         <Data>
-            <DataFromFile>
-            0 0 1 1 2 2 3 3 4 4 5 5
-            </DataFromFile>
-         </Data>
-      </Dataset>
-      <NamedDataType Name="type3" OBJ-XID="/group1/type3" Parents="/group1">
-         <CompoundType>
-            <Field FieldName="int">
-               <DataType> 
-                  <AtomicType>
-                     <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-            <Field FieldName="float">
-               <DataType> 
-                  <AtomicType>
-                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-         </CompoundType>
-      </NamedDataType>
-   </Group>
-   <Group Name="group2" OBJ-XID="/group2" Parents="/" >
-      <Dataset Name="dset5" OBJ-XID="/group2/dset5" Parents="/group2">
-         <StorageLayout>
-            <ChunkedLayout Ndims="1">
-               <ChunkDimension DimSize="2" />
-            </ChunkedLayout>
-         </StorageLayout>
-         <Dataspace>
-            <SimpleDataspace Ndims="1">
-               <Dimension  DimSize="6" MaxDimSize="10"/>
-            </SimpleDataspace>
-         </Dataspace>
-         <NamedDataTypePtr OBJ-XID="/#9560:0"/>
-      <!-- Note: format of compound data not specified -->
-         <Data>
-            <DataFromFile>
-            0 0 1 1 2 2 3 3 4 4 5 5
-            </DataFromFile>
-         </Data>
-      </Dataset>
-   </Group>
-   <Dataset Name="dset1" OBJ-XID="/dset1" Parents="root">
-      <StorageLayout>
-         <ChunkedLayout Ndims="1">
-            <ChunkDimension DimSize="2" />
-         </ChunkedLayout>
-      </StorageLayout>
-      <Dataspace>
-         <SimpleDataspace Ndims="1">
-            <Dimension  DimSize="6" MaxDimSize="UNLIMITED"/>
-         </SimpleDataspace>
-      </Dataspace>
-      <DataType> 
-         <CompoundType>
-            <Field FieldName="a_name">
-               <DataType>
-                  <AtomicType>
-                     <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-            <Field FieldName="b_name">
-               <DataType>
-                  <AtomicType>
-                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-            <Field FieldName="c_name">
-               <DataType>
-                  <AtomicType>
-                     <FloatType ByteOrder="BE" Size="8" SignBitLocation="63" ExponentBits="11" ExponentLocation="52" MantissaBits="52" MantissaLocation="0" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-         </CompoundType>
-      </DataType>
-   <!-- Note: format of compound data not specified -->
-      <Data>
-         <DataFromFile>
-         0 0 1 1 1 0.5 2 4 0.333333 3 9 0.25 4 16 0.2 5 25 0.166667
-         </DataFromFile>
-      </Data>
-   </Dataset>
    <NamedDataType Name="#9560:0" OBJ-XID="/#9560:0" Parents="root">
       <CompoundType>
          <Field FieldName="int">
@@ -192,5 +70,127 @@ Expected output for 'h5dump --xml tcompound2.h5'
          </Field>
       </CompoundType>
    </NamedDataType>
+   <Dataset Name="dset1" OBJ-XID="/dset1" Parents="root">
+      <StorageLayout>
+         <ChunkedLayout Ndims="1">
+            <ChunkDimension DimSize="2" />
+         </ChunkedLayout>
+      </StorageLayout>
+      <Dataspace>
+         <SimpleDataspace Ndims="1">
+            <Dimension  DimSize="6" MaxDimSize="UNLIMITED"/>
+         </SimpleDataspace>
+      </Dataspace>
+      <DataType> 
+         <CompoundType>
+            <Field FieldName="a_name">
+               <DataType>
+                  <AtomicType>
+                     <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+            <Field FieldName="b_name">
+               <DataType>
+                  <AtomicType>
+                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+            <Field FieldName="c_name">
+               <DataType>
+                  <AtomicType>
+                     <FloatType ByteOrder="BE" Size="8" SignBitLocation="63" ExponentBits="11" ExponentLocation="52" MantissaBits="52" MantissaLocation="0" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+         </CompoundType>
+      </DataType>
+   <!-- Note: format of compound data not specified -->
+      <Data>
+         <DataFromFile>
+         0 0 1 1 1 0.5 2 4 0.333333 3 9 0.25 4 16 0.2 5 25 0.166667
+         </DataFromFile>
+      </Data>
+   </Dataset>
+   <Group Name="group1" OBJ-XID="/group1" Parents="/" >
+      <NamedDataType Name="type3" OBJ-XID="/group1/type3" Parents="/group1">
+         <CompoundType>
+            <Field FieldName="int">
+               <DataType> 
+                  <AtomicType>
+                     <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+            <Field FieldName="float">
+               <DataType> 
+                  <AtomicType>
+                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+         </CompoundType>
+      </NamedDataType>
+      <Dataset Name="dset2" OBJ-XID="/group1/dset2" Parents="/group1">
+         <StorageLayout>
+            <ChunkedLayout Ndims="1">
+               <ChunkDimension DimSize="2" />
+            </ChunkedLayout>
+         </StorageLayout>
+         <Dataspace>
+            <SimpleDataspace Ndims="1">
+               <Dimension  DimSize="6" MaxDimSize="10"/>
+            </SimpleDataspace>
+         </Dataspace>
+         <NamedDataTypePtr OBJ-XID="/type1"/>
+      <!-- Note: format of compound data not specified -->
+         <Data>
+            <DataFromFile>
+            0 0 1 1.1 2 2.2 3 3.3 4 4.4 5 5.5
+            </DataFromFile>
+         </Data>
+      </Dataset>
+      <Dataset Name="dset4" OBJ-XID="/group1/dset4" Parents="/group1">
+         <StorageLayout>
+            <ChunkedLayout Ndims="1">
+               <ChunkDimension DimSize="2" />
+            </ChunkedLayout>
+         </StorageLayout>
+         <Dataspace>
+            <SimpleDataspace Ndims="1">
+               <Dimension  DimSize="6" MaxDimSize="10"/>
+            </SimpleDataspace>
+         </Dataspace>
+         <NamedDataTypePtr OBJ-XID="/group1/type3"/>
+      <!-- Note: format of compound data not specified -->
+         <Data>
+            <DataFromFile>
+            0 0 1 1 2 2 3 3 4 4 5 5
+            </DataFromFile>
+         </Data>
+      </Dataset>
+   </Group>
+   <Group Name="group2" OBJ-XID="/group2" Parents="/" >
+      <Dataset Name="dset5" OBJ-XID="/group2/dset5" Parents="/group2">
+         <StorageLayout>
+            <ChunkedLayout Ndims="1">
+               <ChunkDimension DimSize="2" />
+            </ChunkedLayout>
+         </StorageLayout>
+         <Dataspace>
+            <SimpleDataspace Ndims="1">
+               <Dimension  DimSize="6" MaxDimSize="10"/>
+            </SimpleDataspace>
+         </Dataspace>
+         <NamedDataTypePtr OBJ-XID="/#9560:0"/>
+      <!-- Note: format of compound data not specified -->
+         <Data>
+            <DataFromFile>
+            0 0 1 1 2 2 3 3 4 4 5 5
+            </DataFromFile>
+         </Data>
+      </Dataset>
+   </Group>
 </RootGroup>
 </HDF5-File>
diff --git a/tools/testfiles/tenum.h5.xml b/tools/testfiles/tenum.h5.xml
index 7769cb21e3..8fc64a2a41 100644
--- a/tools/testfiles/tenum.h5.xml
+++ b/tools/testfiles/tenum.h5.xml
@@ -5,20 +5,6 @@ Expected output for 'h5dump --xml tenum.h5'
 <!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.dtd">
 <HDF5-File>
 <RootGroup OBJ-XID="root">
-   <Dataset Name="table" OBJ-XID="/table" Parents="root">
-      <Dataspace>
-         <SimpleDataspace Ndims="1">
-            <Dimension  DimSize="20" MaxDimSize="20"/>
-         </SimpleDataspace>
-      </Dataspace>
-      <NamedDataTypePtr OBJ-XID="/enum normal"/>
-      <Data>
-         <DataFromFile>
-         RED GREEN BLUE GREEN WHITE WHITE BLACK GREEN BLUE RED RED BLUE GREEN 
-         BLACK WHITE RED WHITE GREEN GREEN BLUE
-         </DataFromFile>
-      </Data>
-   </Dataset>
    <NamedDataType Name="enum normal" OBJ-XID="/enum normal" Parents="root">
          <AtomicType>
             <EnumType Nelems="5">
@@ -55,5 +41,19 @@ Expected output for 'h5dump --xml tenum.h5'
             </EnumType>
          </AtomicType>
    </NamedDataType>
+   <Dataset Name="table" OBJ-XID="/table" Parents="root">
+      <Dataspace>
+         <SimpleDataspace Ndims="1">
+            <Dimension  DimSize="20" MaxDimSize="20"/>
+         </SimpleDataspace>
+      </Dataspace>
+      <NamedDataTypePtr OBJ-XID="/enum normal"/>
+      <Data>
+         <DataFromFile>
+         RED GREEN BLUE GREEN WHITE WHITE BLACK GREEN BLUE RED RED BLUE GREEN 
+         BLACK WHITE RED WHITE GREEN GREEN BLUE
+         </DataFromFile>
+      </Data>
+   </Dataset>
 </RootGroup>
 </HDF5-File>
diff --git a/tools/testfiles/thlink.h5.xml b/tools/testfiles/thlink.h5.xml
index 518ae3baba..c1165949db 100644
--- a/tools/testfiles/thlink.h5.xml
+++ b/tools/testfiles/thlink.h5.xml
@@ -5,35 +5,35 @@ Expected output for 'h5dump --xml thlink.h5'
 <!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.dtd">
 <HDF5-File>
 <RootGroup OBJ-XID="root">
+   <Dataset Name="dset1" OBJ-XID="/dset1" Parents="root">
+      <Dataspace>
+         <SimpleDataspace Ndims="1">
+            <Dimension  DimSize="5" MaxDimSize="5"/>
+         </SimpleDataspace>
+      </Dataspace>
+      <DataType> 
+         <AtomicType>
+            <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+         </AtomicType>
+      </DataType>
+      <Data>
+         <DataFromFile>
+         0 1 2 3 4
+         </DataFromFile>
+      </Data>
+   </Dataset>
    <Group Name="g1" OBJ-XID="/g1" Parents="/" >
+      <Dataset Name="dset2" OBJ-XID="/g1/dset2" Parents="/g1">
+         <DatasetPtr OBJ-XID="/dset1"/>
+      </Dataset>
       <Group Name="g1.1" OBJ-XID="/g1/g1.1" Parents="/g1" >
          <Dataset Name="dset3" OBJ-XID="/g1/g1.1/dset3" Parents="/g1/g1.1">
-            <Dataspace>
-               <SimpleDataspace Ndims="1">
-                  <Dimension  DimSize="5" MaxDimSize="5"/>
-               </SimpleDataspace>
-            </Dataspace>
-            <DataType> 
-               <AtomicType>
-                  <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-               </AtomicType>
-            </DataType>
-            <Data>
-               <DataFromFile>
-               0 1 2 3 4
-               </DataFromFile>
-            </Data>
+            <DatasetPtr OBJ-XID="/dset1"/>
          </Dataset>
       </Group>
-      <Dataset Name="dset2" OBJ-XID="/g1/dset2" Parents="/g1">
-         <DatasetPtr OBJ-XID="/g1/g1.1/dset3"/>
-      </Dataset>
    </Group>
    <Group Name="g2" OBJ-XID="/g2" Parents="/" >
          <GroupPtr OBJ-XID="/g1/g1.1"/>
    </Group>
-   <Dataset Name="dset1" OBJ-XID="/dset1" Parents="root">
-      <DatasetPtr OBJ-XID="/g1/g1.1/dset3"/>
-   </Dataset>
 </RootGroup>
 </HDF5-File>
diff --git a/tools/testfiles/tobjref.h5.xml b/tools/testfiles/tobjref.h5.xml
index beda91d15c..3cfe6f782d 100644
--- a/tools/testfiles/tobjref.h5.xml
+++ b/tools/testfiles/tobjref.h5.xml
@@ -5,7 +5,54 @@ Expected output for 'h5dump --xml tobjref.h5'
 <!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.dtd">
 <HDF5-File>
 <RootGroup OBJ-XID="root">
+   <Dataset Name="Dataset3" OBJ-XID="/Dataset3" Parents="root">
+      <Dataspace>
+         <SimpleDataspace Ndims="1">
+            <Dimension  DimSize="4" MaxDimSize="4"/>
+         </SimpleDataspace>
+      </Dataspace>
+      <DataType> 
+         <AtomicType>
+            <ReferenceType>
+               <ObjectReferenceType />
+            </ReferenceType>
+         </AtomicType>
+      </DataType>
+   <Data>
+   <DataFromFile>
+      "/Group1/Dataset1"
+      "/Group1/Dataset2"
+      "/Group1"
+      "/Group1/Datatype1"
+   </DataFromFile>
+   </Data>
+   </Dataset>
    <Group Name="Group1" OBJ-XID="/Group1" Parents="/" >
+      <NamedDataType Name="Datatype1" OBJ-XID="/Group1/Datatype1" Parents="/Group1">
+         <CompoundType>
+            <Field FieldName="a">
+               <DataType> 
+                  <AtomicType>
+                     <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+            <Field FieldName="b">
+               <DataType> 
+                  <AtomicType>
+                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+            <Field FieldName="c">
+               <DataType> 
+                  <AtomicType>
+                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
+                  </AtomicType>
+               </DataType>
+            </Field>
+         </CompoundType>
+      </NamedDataType>
       <Dataset Name="Dataset1" OBJ-XID="/Group1/Dataset1" Parents="/Group1">
          <Dataspace>
             <SimpleDataspace Ndims="1">
@@ -40,53 +87,6 @@ Expected output for 'h5dump --xml tobjref.h5'
             </DataFromFile>
          </Data>
       </Dataset>
-      <NamedDataType Name="Datatype1" OBJ-XID="/Group1/Datatype1" Parents="/Group1">
-         <CompoundType>
-            <Field FieldName="a">
-               <DataType> 
-                  <AtomicType>
-                     <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-            <Field FieldName="b">
-               <DataType> 
-                  <AtomicType>
-                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-            <Field FieldName="c">
-               <DataType> 
-                  <AtomicType>
-                     <FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
-                  </AtomicType>
-               </DataType>
-            </Field>
-         </CompoundType>
-      </NamedDataType>
    </Group>
-   <Dataset Name="Dataset3" OBJ-XID="/Dataset3" Parents="root">
-      <Dataspace>
-         <SimpleDataspace Ndims="1">
-            <Dimension  DimSize="4" MaxDimSize="4"/>
-         </SimpleDataspace>
-      </Dataspace>
-      <DataType> 
-         <AtomicType>
-            <ReferenceType>
-               <ObjectReferenceType />
-            </ReferenceType>
-         </AtomicType>
-      </DataType>
-   <Data>
-   <DataFromFile>
-      "/Group1/Dataset1"
-      "/Group1/Dataset2"
-      "/Group1"
-      "/Group1/Datatype1"
-   </DataFromFile>
-   </Data>
-   </Dataset>
 </RootGroup>
 </HDF5-File>
diff --git a/tools/testfiles/tref-escapes-at.h5.xml b/tools/testfiles/tref-escapes-at.h5.xml
index 36a54dc162..03184f3ea9 100644
--- a/tools/testfiles/tref-escapes-at.h5.xml
+++ b/tools/testfiles/tref-escapes-at.h5.xml
@@ -6,6 +6,125 @@ Expected output for 'h5dump --xml tref-escapes-at.h5'
 <HDF5-File>
 <RootGroup OBJ-XID="root">
    <Group Name="Group1" OBJ-XID="/Group1" Parents="/" >
+      <Dataset Name="Dataset space" OBJ-XID="/Group1/Dataset space" Parents="/Group1">
+         <Dataspace>
+            <SimpleDataspace Ndims="1">
+               <Dimension  DimSize="4" MaxDimSize="4"/>
+            </SimpleDataspace>
+         </Dataspace>
+         <DataType> 
+            <AtomicType>
+               <IntegerType ByteOrder="BE" Sign="false" Size="1" />
+            </AtomicType>
+         </DataType>
+         <Data>
+            <DataFromFile>
+            0 0 0 0
+            </DataFromFile>
+         </Data>
+      </Dataset>
+      <Dataset Name="Dataset&quot;quote" OBJ-XID="/Group1/Dataset&quot;quote" Parents="/Group1">
+         <Dataspace>
+            <SimpleDataspace Ndims="1">
+               <Dimension  DimSize="4" MaxDimSize="4"/>
+            </SimpleDataspace>
+         </Dataspace>
+         <DataType> 
+            <AtomicType>
+               <IntegerType ByteOrder="BE" Sign="false" Size="4" />
+            </AtomicType>
+         </DataType>
+         <Data>
+            <DataFromFile>
+            0 3 6 9
+            </DataFromFile>
+         </Data>
+      </Dataset>
+      <Dataset Name="Dataset&amp;amp" OBJ-XID="/Group1/Dataset&amp;amp" Parents="/Group1">
+         <Dataspace>
+            <SimpleDataspace Ndims="1">
+               <Dimension  DimSize="4" MaxDimSize="4"/>
+            </SimpleDataspace>
+         </Dataspace>
+         <DataType> 
+            <AtomicType>
+               <IntegerType ByteOrder="BE" Sign="false" Size="1" />
+            </AtomicType>
+         </DataType>
+         <Data>
+            <DataFromFile>
+            0 0 0 0
+            </DataFromFile>
+         </Data>
+      </Dataset>
+      <Dataset Name="Dataset&apos;apos" OBJ-XID="/Group1/Dataset&apos;apos" Parents="/Group1">
+         <Dataspace>
+            <SimpleDataspace Ndims="1">
+               <Dimension  DimSize="4" MaxDimSize="4"/>
+            </SimpleDataspace>
+         </Dataspace>
+         <DataType> 
+            <AtomicType>
+               <IntegerType ByteOrder="BE" Sign="false" Size="1" />
+            </AtomicType>
+         </DataType>
+         <Data>
+            <DataFromFile>
+            0 0 0 0
+            </DataFromFile>
+         </Data>
+      </Dataset>
+      <Dataset Name="Dataset&lt;lt" OBJ-XID="/Group1/Dataset&lt;lt" Parents="/Group1">
+         <Dataspace>
+            <SimpleDataspace Ndims="1">
+               <Dimension  DimSize="4" MaxDimSize="4"/>
+            </SimpleDataspace>
+         </Dataspace>
+         <DataType> 
+            <AtomicType>
+               <IntegerType ByteOrder="BE" Sign="false" Size="1" />
+            </AtomicType>
+         </DataType>
+         <Data>
+            <DataFromFile>
+            0 0 0 0
+            </DataFromFile>
+         </Data>
+      </Dataset>
+      <Dataset Name="Dataset&gt;gt" OBJ-XID="/Group1/Dataset&gt;gt" Parents="/Group1">
+         <Dataspace>
+            <SimpleDataspace Ndims="1">
+               <Dimension  DimSize="4" MaxDimSize="4"/>
+            </SimpleDataspace>
+         </Dataspace>
+         <DataType> 
+            <AtomicType>
+               <IntegerType ByteOrder="BE" Sign="false" Size="1" />
+            </AtomicType>
+         </DataType>
+         <Data>
+            <DataFromFile>
+            0 0 0 0
+            </DataFromFile>
+         </Data>
+      </Dataset>
+      <Dataset Name="Dataset\slash" OBJ-XID="/Group1/Dataset\slash" Parents="/Group1">
+         <Dataspace>
+            <SimpleDataspace Ndims="1">
+               <Dimension  DimSize="4" MaxDimSize="4"/>
+            </SimpleDataspace>
+         </Dataspace>
+         <DataType> 
+            <AtomicType>
+               <IntegerType ByteOrder="BE" Sign="false" Size="1" />
+            </AtomicType>
+         </DataType>
+         <Data>
+            <DataFromFile>
+            0 0 0 0
+            </DataFromFile>
+         </Data>
+      </Dataset>
       <Group Name="Group1.1" OBJ-XID="/Group1/Group1.1" Parents="/Group1" >
          <Dataset Name="Datasetrefs" OBJ-XID="/Group1/Group1.1/Datasetrefs" Parents="/Group1/Group1.1">
             <Dataspace>
@@ -158,125 +277,6 @@ Expected output for 'h5dump --xml tref-escapes-at.h5'
             </Data>
          </Dataset>
       </Group>
-      <Dataset Name="Dataset space" OBJ-XID="/Group1/Dataset space" Parents="/Group1">
-         <Dataspace>
-            <SimpleDataspace Ndims="1">
-               <Dimension  DimSize="4" MaxDimSize="4"/>
-            </SimpleDataspace>
-         </Dataspace>
-         <DataType> 
-            <AtomicType>
-               <IntegerType ByteOrder="BE" Sign="false" Size="1" />
-            </AtomicType>
-         </DataType>
-         <Data>
-            <DataFromFile>
-            0 0 0 0
-            </DataFromFile>
-         </Data>
-      </Dataset>
-      <Dataset Name="Dataset&quot;quote" OBJ-XID="/Group1/Dataset&quot;quote" Parents="/Group1">
-         <Dataspace>
-            <SimpleDataspace Ndims="1">
-               <Dimension  DimSize="4" MaxDimSize="4"/>
-            </SimpleDataspace>
-         </Dataspace>
-         <DataType> 
-            <AtomicType>
-               <IntegerType ByteOrder="BE" Sign="false" Size="4" />
-            </AtomicType>
-         </DataType>
-         <Data>
-            <DataFromFile>
-            0 3 6 9
-            </DataFromFile>
-         </Data>
-      </Dataset>
-      <Dataset Name="Dataset&amp;amp" OBJ-XID="/Group1/Dataset&amp;amp" Parents="/Group1">
-         <Dataspace>
-            <SimpleDataspace Ndims="1">
-               <Dimension  DimSize="4" MaxDimSize="4"/>
-            </SimpleDataspace>
-         </Dataspace>
-         <DataType> 
-            <AtomicType>
-               <IntegerType ByteOrder="BE" Sign="false" Size="1" />
-            </AtomicType>
-         </DataType>
-         <Data>
-            <DataFromFile>
-            0 0 0 0
-            </DataFromFile>
-         </Data>
-      </Dataset>
-      <Dataset Name="Dataset&apos;apos" OBJ-XID="/Group1/Dataset&apos;apos" Parents="/Group1">
-         <Dataspace>
-            <SimpleDataspace Ndims="1">
-               <Dimension  DimSize="4" MaxDimSize="4"/>
-            </SimpleDataspace>
-         </Dataspace>
-         <DataType> 
-            <AtomicType>
-               <IntegerType ByteOrder="BE" Sign="false" Size="1" />
-            </AtomicType>
-         </DataType>
-         <Data>
-            <DataFromFile>
-            0 0 0 0
-            </DataFromFile>
-         </Data>
-      </Dataset>
-      <Dataset Name="Dataset&lt;lt" OBJ-XID="/Group1/Dataset&lt;lt" Parents="/Group1">
-         <Dataspace>
-            <SimpleDataspace Ndims="1">
-               <Dimension  DimSize="4" MaxDimSize="4"/>
-            </SimpleDataspace>
-         </Dataspace>
-         <DataType> 
-            <AtomicType>
-               <IntegerType ByteOrder="BE" Sign="false" Size="1" />
-            </AtomicType>
-         </DataType>
-         <Data>
-            <DataFromFile>
-            0 0 0 0
-            </DataFromFile>
-         </Data>
-      </Dataset>
-      <Dataset Name="Dataset&gt;gt" OBJ-XID="/Group1/Dataset&gt;gt" Parents="/Group1">
-         <Dataspace>
-            <SimpleDataspace Ndims="1">
-               <Dimension  DimSize="4" MaxDimSize="4"/>
-            </SimpleDataspace>
-         </Dataspace>
-         <DataType> 
-            <AtomicType>
-               <IntegerType ByteOrder="BE" Sign="false" Size="1" />
-            </AtomicType>
-         </DataType>
-         <Data>
-            <DataFromFile>
-            0 0 0 0
-            </DataFromFile>
-         </Data>
-      </Dataset>
-      <Dataset Name="Dataset\slash" OBJ-XID="/Group1/Dataset\slash" Parents="/Group1">
-         <Dataspace>
-            <SimpleDataspace Ndims="1">
-               <Dimension  DimSize="4" MaxDimSize="4"/>
-            </SimpleDataspace>
-         </Dataspace>
-         <DataType> 
-            <AtomicType>
-               <IntegerType ByteOrder="BE" Sign="false" Size="1" />
-            </AtomicType>
-         </DataType>
-         <Data>
-            <DataFromFile>
-            0 0 0 0
-            </DataFromFile>
-         </Data>
-      </Dataset>
    </Group>
 </RootGroup>
 </HDF5-File>
diff --git a/tools/testfiles/tref-escapes.h5.xml b/tools/testfiles/tref-escapes.h5.xml
index 40f5d5ec6b..4f471444c8 100644
--- a/tools/testfiles/tref-escapes.h5.xml
+++ b/tools/testfiles/tref-escapes.h5.xml
@@ -6,33 +6,6 @@ Expected output for 'h5dump --xml tref-escapes.h5'
 <HDF5-File>
 <RootGroup OBJ-XID="root">
    <Group Name="Group1" OBJ-XID="/Group1" Parents="/" >
-      <Group Name="Group1.1" OBJ-XID="/Group1/Group1.1" Parents="/Group1" >
-         <Dataset Name="Datasetrefs" OBJ-XID="/Group1/Group1.1/Datasetrefs" Parents="/Group1/Group1.1">
-            <Dataspace>
-               <SimpleDataspace Ndims="1">
-                  <Dimension  DimSize="7" MaxDimSize="7"/>
-               </SimpleDataspace>
-            </Dataspace>
-            <DataType> 
-               <AtomicType>
-                  <ReferenceType>
-                     <ObjectReferenceType />
-                  </ReferenceType>
-               </AtomicType>
-            </DataType>
-         <Data>
-         <DataFromFile>
-            "/Group1/Dataset\"quote"
-            "/Group1/Dataset\\slash"
-            "/Group1/Dataset&amp;amp"
-            "/Group1/Dataset&lt;lt"
-            "/Group1/Dataset space"
-            "/Group1/Dataset&apos;apos"
-            "/Group1/Dataset&gt;gt"
-         </DataFromFile>
-         </Data>
-         </Dataset>
-      </Group>
       <Dataset Name="Dataset space" OBJ-XID="/Group1/Dataset space" Parents="/Group1">
          <Dataspace>
             <SimpleDataspace Ndims="1">
@@ -152,6 +125,33 @@ Expected output for 'h5dump --xml tref-escapes.h5'
             </DataFromFile>
          </Data>
       </Dataset>
+      <Group Name="Group1.1" OBJ-XID="/Group1/Group1.1" Parents="/Group1" >
+         <Dataset Name="Datasetrefs" OBJ-XID="/Group1/Group1.1/Datasetrefs" Parents="/Group1/Group1.1">
+            <Dataspace>
+               <SimpleDataspace Ndims="1">
+                  <Dimension  DimSize="7" MaxDimSize="7"/>
+               </SimpleDataspace>
+            </Dataspace>
+            <DataType> 
+               <AtomicType>
+                  <ReferenceType>
+                     <ObjectReferenceType />
+                  </ReferenceType>
+               </AtomicType>
+            </DataType>
+         <Data>
+         <DataFromFile>
+            "/Group1/Dataset\"quote"
+            "/Group1/Dataset\\slash"
+            "/Group1/Dataset&amp;amp"
+            "/Group1/Dataset&lt;lt"
+            "/Group1/Dataset space"
+            "/Group1/Dataset&apos;apos"
+            "/Group1/Dataset&gt;gt"
+         </DataFromFile>
+         </Data>
+         </Dataset>
+      </Group>
    </Group>
 </RootGroup>
 </HDF5-File>
diff --git a/tools/testfiles/tref.h5.xml b/tools/testfiles/tref.h5.xml
index 0c2fc833c3..26373475ed 100644
--- a/tools/testfiles/tref.h5.xml
+++ b/tools/testfiles/tref.h5.xml
@@ -5,6 +5,27 @@ Expected output for 'h5dump --xml tref.h5'
 <!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.dtd">
 <HDF5-File>
 <RootGroup OBJ-XID="root">
+   <Dataset Name="ZZZDataset3" OBJ-XID="/ZZZDataset3" Parents="root">
+      <Dataspace>
+         <SimpleDataspace Ndims="1">
+            <Dimension  DimSize="3" MaxDimSize="3"/>
+         </SimpleDataspace>
+      </Dataspace>
+      <DataType> 
+         <AtomicType>
+            <ReferenceType>
+               <ObjectReferenceType />
+            </ReferenceType>
+         </AtomicType>
+      </DataType>
+   <Data>
+   <DataFromFile>
+      "/Group1/Dataset1"
+      "/Group1/Dataset2"
+      "/Group1"
+   </DataFromFile>
+   </Data>
+   </Dataset>
    <Group Name="Group1" OBJ-XID="/Group1" Parents="/" >
       <Dataset Name="Dataset1" OBJ-XID="/Group1/Dataset1" Parents="/Group1">
          <Dataspace>
@@ -41,26 +62,5 @@ Expected output for 'h5dump --xml tref.h5'
          </Data>
       </Dataset>
    </Group>
-   <Dataset Name="ZZZDataset3" OBJ-XID="/ZZZDataset3" Parents="root">
-      <Dataspace>
-         <SimpleDataspace Ndims="1">
-            <Dimension  DimSize="3" MaxDimSize="3"/>
-         </SimpleDataspace>
-      </Dataspace>
-      <DataType> 
-         <AtomicType>
-            <ReferenceType>
-               <ObjectReferenceType />
-            </ReferenceType>
-         </AtomicType>
-      </DataType>
-   <Data>
-   <DataFromFile>
-      "/Group1/Dataset1"
-      "/Group1/Dataset2"
-      "/Group1"
-   </DataFromFile>
-   </Data>
-   </Dataset>
 </RootGroup>
 </HDF5-File>
diff --git a/tools/testfiles/tsaf.h5.xml b/tools/testfiles/tsaf.h5.xml
index 9e006d761a..9b3feef224 100644
--- a/tools/testfiles/tsaf.h5.xml
+++ b/tools/testfiles/tsaf.h5.xml
@@ -5,287 +5,6 @@ Expected output for 'h5dump --xml tsaf.h5'
 <!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.dtd">
 <HDF5-File>
 <RootGroup OBJ-XID="root">
-   <Group Name=".attributes" OBJ-XID="/.attributes" Parents="/" >
-      <Group Name="database" OBJ-XID="/.attributes/database" Parents="/.attributes" >
-         <Dataset Name=".SAF_DbProps" OBJ-XID="/.attributes/database/.SAF_DbProps" Parents="/.attributes/database">
-            <Dataspace>
-               <SimpleDataspace Ndims="1">
-                  <Dimension  DimSize="1" MaxDimSize="1"/>
-               </SimpleDataspace>
-            </Dataspace>
-            <DataType> 
-               <CompoundType>
-                  <Field FieldName="magic">
-                     <DataType>
-                        <AtomicType>
-                           <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                        </AtomicType>
-                     </DataType>
-                  </Field>
-                  <Field FieldName="SFileDir">
-                     <DataType>
-                        <AtomicType>
-                           <StringType Cset="H5T_CSET_ASCII" StrSize="1024" StrPad="H5T_STR_NULLTERM"/>
-                        </AtomicType>
-                     </DataType>
-                  </Field>
-                  <Field FieldName="ImportFile">
-                     <DataType>
-                        <AtomicType>
-                           <StringType Cset="H5T_CSET_ASCII" StrSize="1024" StrPad="H5T_STR_NULLTERM"/>
-                        </AtomicType>
-                     </DataType>
-                  </Field>
-                  <Field FieldName="parallel">
-                     <DataType>
-                        <AtomicType>
-                           <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                        </AtomicType>
-                     </DataType>
-                  </Field>
-                  <Field FieldName="safapi">
-                     <DataType>
-                        <CompoundType>
-                           <Field FieldName="vmajor">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="vminor">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="rel">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="annot">
-                              <DataType>
-                                 <AtomicType>
-                                    <StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                        </CompoundType>
-                     </DataType>
-                  </Field>
-                  <Field FieldName="saflib">
-                     <DataType>
-                        <CompoundType>
-                           <Field FieldName="vmajor">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="vminor">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="rel">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="annot">
-                              <DataType>
-                                 <AtomicType>
-                                    <StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                        </CompoundType>
-                     </DataType>
-                  </Field>
-                  <Field FieldName="vbt">
-                     <DataType>
-                        <CompoundType>
-                           <Field FieldName="vmajor">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="vminor">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="rel">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="annot">
-                              <DataType>
-                                 <AtomicType>
-                                    <StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                        </CompoundType>
-                     </DataType>
-                  </Field>
-                  <Field FieldName="dsl">
-                     <DataType>
-                        <CompoundType>
-                           <Field FieldName="vmajor">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="vminor">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="rel">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="annot">
-                              <DataType>
-                                 <AtomicType>
-                                    <StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                        </CompoundType>
-                     </DataType>
-                  </Field>
-                  <Field FieldName="hdf5">
-                     <DataType>
-                        <CompoundType>
-                           <Field FieldName="vmajor">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="vminor">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="rel">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="annot">
-                              <DataType>
-                                 <AtomicType>
-                                    <StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                        </CompoundType>
-                     </DataType>
-                  </Field>
-                  <Field FieldName="mpi">
-                     <DataType>
-                        <CompoundType>
-                           <Field FieldName="vmajor">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="vminor">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="rel">
-                              <DataType>
-                                 <AtomicType>
-                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                           <Field FieldName="annot">
-                              <DataType>
-                                 <AtomicType>
-                                    <StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
-                                 </AtomicType>
-                              </DataType>
-                           </Field>
-                        </CompoundType>
-                     </DataType>
-                  </Field>
-                  <Field FieldName="DoToc">
-                     <DataType>
-                        <AtomicType>
-                           <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                        </AtomicType>
-                     </DataType>
-                  </Field>
-                  <Field FieldName="ReadOnly">
-                     <DataType>
-                        <AtomicType>
-                           <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                        </AtomicType>
-                     </DataType>
-                  </Field>
-                  <Field FieldName="Clobber">
-                     <DataType>
-                        <AtomicType>
-                           <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                        </AtomicType>
-                     </DataType>
-                  </Field>
-                  <Field FieldName="OSModes">
-                     <DataType>
-                        <AtomicType>
-                           <IntegerType ByteOrder="BE" Sign="true" Size="4" />
-                        </AtomicType>
-                     </DataType>
-                  </Field>
-               </CompoundType>
-            </DataType>
-         <!-- Note: format of compound data not specified -->
-            <Data>
-               <DataFromFile>
-               -604320037 "." "don't import" 1 0 0 0 "none" 0 1 0 "devel" 1 3 0 "" 0 0 0 "none" 1 2 1 "" 1 2 0 "" 1 0 1 0
-               </DataFromFile>
-            </Data>
-         </Dataset>
-      </Group>
-   </Group>
    <Dataset Name=".DSL_METADATA" OBJ-XID="/.DSL_METADATA" Parents="root">
       <StorageLayout>
          <ChunkedLayout Ndims="1">
@@ -2598,5 +2317,286 @@ Expected output for 'h5dump --xml tsaf.h5'
          </DataFromFile>
       </Data>
    </Dataset>
+   <Group Name=".attributes" OBJ-XID="/.attributes" Parents="/" >
+      <Group Name="database" OBJ-XID="/.attributes/database" Parents="/.attributes" >
+         <Dataset Name=".SAF_DbProps" OBJ-XID="/.attributes/database/.SAF_DbProps" Parents="/.attributes/database">
+            <Dataspace>
+               <SimpleDataspace Ndims="1">
+                  <Dimension  DimSize="1" MaxDimSize="1"/>
+               </SimpleDataspace>
+            </Dataspace>
+            <DataType> 
+               <CompoundType>
+                  <Field FieldName="magic">
+                     <DataType>
+                        <AtomicType>
+                           <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                        </AtomicType>
+                     </DataType>
+                  </Field>
+                  <Field FieldName="SFileDir">
+                     <DataType>
+                        <AtomicType>
+                           <StringType Cset="H5T_CSET_ASCII" StrSize="1024" StrPad="H5T_STR_NULLTERM"/>
+                        </AtomicType>
+                     </DataType>
+                  </Field>
+                  <Field FieldName="ImportFile">
+                     <DataType>
+                        <AtomicType>
+                           <StringType Cset="H5T_CSET_ASCII" StrSize="1024" StrPad="H5T_STR_NULLTERM"/>
+                        </AtomicType>
+                     </DataType>
+                  </Field>
+                  <Field FieldName="parallel">
+                     <DataType>
+                        <AtomicType>
+                           <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                        </AtomicType>
+                     </DataType>
+                  </Field>
+                  <Field FieldName="safapi">
+                     <DataType>
+                        <CompoundType>
+                           <Field FieldName="vmajor">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="vminor">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="rel">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="annot">
+                              <DataType>
+                                 <AtomicType>
+                                    <StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                        </CompoundType>
+                     </DataType>
+                  </Field>
+                  <Field FieldName="saflib">
+                     <DataType>
+                        <CompoundType>
+                           <Field FieldName="vmajor">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="vminor">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="rel">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="annot">
+                              <DataType>
+                                 <AtomicType>
+                                    <StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                        </CompoundType>
+                     </DataType>
+                  </Field>
+                  <Field FieldName="vbt">
+                     <DataType>
+                        <CompoundType>
+                           <Field FieldName="vmajor">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="vminor">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="rel">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="annot">
+                              <DataType>
+                                 <AtomicType>
+                                    <StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                        </CompoundType>
+                     </DataType>
+                  </Field>
+                  <Field FieldName="dsl">
+                     <DataType>
+                        <CompoundType>
+                           <Field FieldName="vmajor">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="vminor">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="rel">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="annot">
+                              <DataType>
+                                 <AtomicType>
+                                    <StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                        </CompoundType>
+                     </DataType>
+                  </Field>
+                  <Field FieldName="hdf5">
+                     <DataType>
+                        <CompoundType>
+                           <Field FieldName="vmajor">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="vminor">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="rel">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="annot">
+                              <DataType>
+                                 <AtomicType>
+                                    <StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                        </CompoundType>
+                     </DataType>
+                  </Field>
+                  <Field FieldName="mpi">
+                     <DataType>
+                        <CompoundType>
+                           <Field FieldName="vmajor">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="vminor">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="rel">
+                              <DataType>
+                                 <AtomicType>
+                                    <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                           <Field FieldName="annot">
+                              <DataType>
+                                 <AtomicType>
+                                    <StringType Cset="H5T_CSET_ASCII" StrSize="10" StrPad="H5T_STR_NULLTERM"/>
+                                 </AtomicType>
+                              </DataType>
+                           </Field>
+                        </CompoundType>
+                     </DataType>
+                  </Field>
+                  <Field FieldName="DoToc">
+                     <DataType>
+                        <AtomicType>
+                           <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                        </AtomicType>
+                     </DataType>
+                  </Field>
+                  <Field FieldName="ReadOnly">
+                     <DataType>
+                        <AtomicType>
+                           <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                        </AtomicType>
+                     </DataType>
+                  </Field>
+                  <Field FieldName="Clobber">
+                     <DataType>
+                        <AtomicType>
+                           <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                        </AtomicType>
+                     </DataType>
+                  </Field>
+                  <Field FieldName="OSModes">
+                     <DataType>
+                        <AtomicType>
+                           <IntegerType ByteOrder="BE" Sign="true" Size="4" />
+                        </AtomicType>
+                     </DataType>
+                  </Field>
+               </CompoundType>
+            </DataType>
+         <!-- Note: format of compound data not specified -->
+            <Data>
+               <DataFromFile>
+               -604320037 "." "don't import" 1 0 0 0 "none" 0 1 0 "devel" 1 3 0 "" 0 0 0 "none" 1 2 1 "" 1 2 0 "" 1 0 1 0
+               </DataFromFile>
+            </Data>
+         </Dataset>
+      </Group>
+   </Group>
 </RootGroup>
 </HDF5-File>