5 files changed, 12 insertions, 12 deletions
diff --git a/tools/testfiles/tattr-2.ddl b/tools/testfiles/tattr-2.ddl
index 01d9fb9..42afa98 100644
--- a/tools/testfiles/tattr-2.ddl
+++ b/tools/testfiles/tattr-2.ddl
@@ -1,8 +1,8 @@
 #############################
-Expected output for 'h5dump -a attr1 --attribute attr4 --attribute=attr5 tattr.h5'
+Expected output for 'h5dump -a /attr1 --attribute /attr4 --attribute=/attr5 tattr.h5'
 #############################
 HDF5 "tattr.h5" {
-ATTRIBUTE "attr1" {
+ATTRIBUTE "/attr1" {
    DATATYPE  H5T_STD_I8BE  
    DATASPACE  SIMPLE { ( 24 ) / ( 24 ) } 
    DATA {
@@ -10,14 +10,14 @@ ATTRIBUTE "attr1" {
       111, 116, 32, 103, 114, 111, 117, 112, 0
    } 
 } 
-ATTRIBUTE "attr4" {
+ATTRIBUTE "/attr4" {
    DATATYPE  H5T_STD_I32BE  
    DATASPACE  SCALAR  
    DATA {
       100
    } 
 } 
-ATTRIBUTE "attr5" {
+ATTRIBUTE "/attr5" {
    DATATYPE  H5T_STRING {
          STRSIZE 17;
          STRPAD H5T_STR_NULLTERM;
diff --git a/tools/testfiles/tattr-3.ddl b/tools/testfiles/tattr-3.ddl
index 41397f9..4e0bea3 100644
--- a/tools/testfiles/tattr-3.ddl
+++ b/tools/testfiles/tattr-3.ddl
@@ -1,12 +1,12 @@
 #############################
-Expected output for 'h5dump --header -a attr2 --attribute=attr tattr.h5'
+Expected output for 'h5dump --header -a /attr2 --attribute=/attr tattr.h5'
 #############################
 HDF5 "tattr.h5" {
-ATTRIBUTE "attr2" {
+ATTRIBUTE "/attr2" {
    DATATYPE  H5T_STD_I32BE  
    DATASPACE  SIMPLE { ( 10 ) / ( 10 ) } 
 } 
-ATTRIBUTE "attr" {
-   h5dump error: unable to open attribute.
+ATTRIBUTE "/attr" {
+   h5dump error: unable to open attribute "/"
 } 
 } 
diff --git a/tools/testfiles/tcomp-3.ddl b/tools/testfiles/tcomp-3.ddl
index 0018422..c4f674f 100644
--- a/tools/testfiles/tcomp-3.ddl
+++ b/tools/testfiles/tcomp-3.ddl
@@ -3,7 +3,7 @@ Expected output for 'h5dump -t /#5992:0 -g /group2 tcompound.h5'
 #############################
 HDF5 "tcompound.h5" {
 DATATYPE "/#5992:0" 
-   h5dump error: unable to open /#5992:0
+   h5dump error: unable to open datatype "/#5992:0"
  
 GROUP "/group2" {
    DATASET "dset5" {
diff --git a/tools/testfiles/tdset-2.ddl b/tools/testfiles/tdset-2.ddl
index 8276e22..30dfec6 100644
--- a/tools/testfiles/tdset-2.ddl
+++ b/tools/testfiles/tdset-2.ddl
@@ -11,6 +11,6 @@ DATASET "/dset2" {
    DATASPACE  SIMPLE { ( 30, 20 ) / ( 30, 20 ) } 
 } 
 DATASET "dset3" {
-   h5dump error: unable to open dset3
+   h5dump error: unable to open dataset "dset3"
 } 
 } 
diff --git a/tools/testfiles/tgroup-2.ddl b/tools/testfiles/tgroup-2.ddl
index d57ebf1..a0d0ab7 100644
--- a/tools/testfiles/tgroup-2.ddl
+++ b/tools/testfiles/tgroup-2.ddl
@@ -1,5 +1,5 @@
 #############################
-Expected output for 'h5dump -g /g2 -g / -g /y tgroup.h5'
+Expected output for 'h5dump --group=/g2 --group / -g /y tgroup.h5'
 #############################
 HDF5 "tgroup.h5" {
 GROUP "/g2" {
@@ -41,6 +41,6 @@ GROUP "/" {
    } 
 } 
 GROUP "/y" {
-   h5dump error: unable to open /y
+   h5dump error: unable to open group "/y"
 } 
 }