diff --git a/MANIFEST b/MANIFEST
index dec06d3999..fdde57569a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1128,25 +1128,6 @@
 ./tools/testfiles/tvldtypes4.ddl
 ./tools/testfiles/tvldtypes4.h5
 
-#new hdf4 files for testing converter
-./tools/testfiles/anno_test.hdf
-./tools/testfiles/gr_typ_test.hdf
-./tools/testfiles/grnameclash_test.hdf
-./tools/testfiles/image_attr_test.hdf
-./tools/testfiles/ras_24_test.hdf
-./tools/testfiles/ras_8_test.hdf
-./tools/testfiles/ras24il.hdf
-./tools/testfiles/sds_attr_test.hdf
-./tools/testfiles/sds_dim_test.hdf
-./tools/testfiles/sds_typ_test.hdf
-./tools/testfiles/sdsnameclash_test.hdf
-./tools/testfiles/vdata_test.hdf
-./tools/testfiles/vdnameclash_test.hdf
-./tools/testfiles/vg_all_test.hdf
-./tools/testfiles/vg_hl_test.hdf
-./tools/testfiles/vg_loop_test.hdf
-./tools/testfiles/vgnameclash_test.hdf
-
 # Expected output from h5ls tests
 ./tools/testfiles/help-1.ls
 ./tools/testfiles/help-2.ls
@@ -1164,40 +1145,6 @@
 ./tools/testfiles/tslink-1.ls
 ./tools/testfiles/tstr-1.ls
 
-./tools/testfiles/Expected/tall.hdf
-./tools/testfiles/Expected/tattr.hdf
-./tools/testfiles/Expected/tcompound.hdf
-./tools/testfiles/Expected/tcompound2.hdf
-./tools/testfiles/Expected/tdset.hdf
-./tools/testfiles/Expected/tdset2.hdf
-./tools/testfiles/Expected/tgroup.hdf
-./tools/testfiles/Expected/thlink.hdf
-./tools/testfiles/Expected/tloop.hdf
-./tools/testfiles/Expected/tmany.hdf
-./tools/testfiles/Expected/tslink.hdf
-./tools/testfiles/Expected/tstr.hdf
-./tools/testfiles/Expected/tstr2.hdf
-
-#new expected hdf5 files from converter,2/15/01
-./tools/testfiles/Expected/anno_test.h5
-./tools/testfiles/Expected/gr_typ_test.h5
-./tools/testfiles/Expected/grnameclash_test.h5
-./tools/testfiles/Expected/image_attr_test.h5
-./tools/testfiles/Expected/ras_24_test.h5
-./tools/testfiles/Expected/ras_8_test.h5
-./tools/testfiles/Expected/ras24il.h5
-./tools/testfiles/Expected/sds_attr.h5
-./tools/testfiles/Expected/sds_attr_test.h5
-./tools/testfiles/Expected/sds_dim_test.h5
-./tools/testfiles/Expected/sds_typ_test.h5
-./tools/testfiles/Expected/sdsnameclash_test.h5
-./tools/testfiles/Expected/vdata_test.h5
-./tools/testfiles/Expected/vdnameclash_test.h5
-./tools/testfiles/Expected/vg_all_test.h5
-./tools/testfiles/Expected/vg_hl_test.h5
-./tools/testfiles/Expected/vg_loop_test.h5
-./tools/testfiles/Expected/vgnameclash_test.h5
-
 #additional test input and output for h5dump XML
 ./tools/testfiles/tall.h5.xml
 ./tools/testfiles/tarray1.h5.xml
diff --git a/tools/testfiles/Expected/anno_test.h5 b/tools/testfiles/Expected/anno_test.h5
deleted file mode 100644
index 8656bc25a2..0000000000
Binary files a/tools/testfiles/Expected/anno_test.h5 and /dev/null differ
diff --git a/tools/testfiles/Expected/gr_typ_test.h5 b/tools/testfiles/Expected/gr_typ_test.h5
deleted file mode 100644
index 9238a469cd..0000000000
Binary files a/tools/testfiles/Expected/gr_typ_test.h5 and /dev/null differ
diff --git a/tools/testfiles/Expected/grnameclash_test.h5 b/tools/testfiles/Expected/grnameclash_test.h5
deleted file mode 100644
index 934af43b41..0000000000
Binary files a/tools/testfiles/Expected/grnameclash_test.h5 and /dev/null differ
diff --git a/tools/testfiles/Expected/image_attr_test.h5 b/tools/testfiles/Expected/image_attr_test.h5
deleted file mode 100644
index 9fd1e18777..0000000000
Binary files a/tools/testfiles/Expected/image_attr_test.h5 and /dev/null differ
diff --git a/tools/testfiles/Expected/ras24il.h5 b/tools/testfiles/Expected/ras24il.h5
deleted file mode 100644
index cfc2c0413b..0000000000
Binary files a/tools/testfiles/Expected/ras24il.h5 and /dev/null differ
diff --git a/tools/testfiles/Expected/ras_24_test.h5 b/tools/testfiles/Expected/ras_24_test.h5
deleted file mode 100644
index 7ecc9decb0..0000000000
Binary files a/tools/testfiles/Expected/ras_24_test.h5 and /dev/null differ
diff --git a/tools/testfiles/Expected/ras_8_test.h5 b/tools/testfiles/Expected/ras_8_test.h5
deleted file mode 100644
index 3d3c4027df..0000000000
Binary files a/tools/testfiles/Expected/ras_8_test.h5 and /dev/null differ
diff --git a/tools/testfiles/Expected/sds_attr.h5 b/tools/testfiles/Expected/sds_attr.h5
deleted file mode 100644
index 49b2b0b8ba..0000000000
Binary files a/tools/testfiles/Expected/sds_attr.h5 and /dev/null differ
diff --git a/tools/testfiles/Expected/sds_attr_test.h5 b/tools/testfiles/Expected/sds_attr_test.h5
deleted file mode 100644
index 4628e155c1..0000000000
Binary files a/tools/testfiles/Expected/sds_attr_test.h5 and /dev/null differ
diff --git a/tools/testfiles/Expected/sds_dim_test.h5 b/tools/testfiles/Expected/sds_dim_test.h5
deleted file mode 100644
index c3f9bedeed..0000000000
Binary files a/tools/testfiles/Expected/sds_dim_test.h5 and /dev/null differ
diff --git a/tools/testfiles/Expected/sds_typ_test.h5 b/tools/testfiles/Expected/sds_typ_test.h5
deleted file mode 100644
index a26bb90d5d..0000000000
Binary files a/tools/testfiles/Expected/sds_typ_test.h5 and /dev/null differ
diff --git a/tools/testfiles/Expected/sdsnameclash_test.h5 b/tools/testfiles/Expected/sdsnameclash_test.h5
deleted file mode 100644
index 4eacd82839..0000000000
Binary files a/tools/testfiles/Expected/sdsnameclash_test.h5 and /dev/null differ
diff --git a/tools/testfiles/Expected/tall.hdf b/tools/testfiles/Expected/tall.hdf
deleted file mode 100644
index b99ac28a8e..0000000000
Binary files a/tools/testfiles/Expected/tall.hdf and /dev/null differ
diff --git a/tools/testfiles/Expected/tattr.hdf b/tools/testfiles/Expected/tattr.hdf
deleted file mode 100644
index 36b2497459..0000000000
Binary files a/tools/testfiles/Expected/tattr.hdf and /dev/null differ
diff --git a/tools/testfiles/Expected/tcompound.hdf b/tools/testfiles/Expected/tcompound.hdf
deleted file mode 100644
index e5809d79de..0000000000
Binary files a/tools/testfiles/Expected/tcompound.hdf and /dev/null differ
diff --git a/tools/testfiles/Expected/tcompound2.hdf b/tools/testfiles/Expected/tcompound2.hdf
deleted file mode 100644
index c0c5191f43..0000000000
Binary files a/tools/testfiles/Expected/tcompound2.hdf and /dev/null differ
diff --git a/tools/testfiles/Expected/tdset.hdf b/tools/testfiles/Expected/tdset.hdf
deleted file mode 100644
index 79753eaef8..0000000000
Binary files a/tools/testfiles/Expected/tdset.hdf and /dev/null differ
diff --git a/tools/testfiles/Expected/tdset2.hdf b/tools/testfiles/Expected/tdset2.hdf
deleted file mode 100644
index 2005d796f0..0000000000
Binary files a/tools/testfiles/Expected/tdset2.hdf and /dev/null differ
diff --git a/tools/testfiles/Expected/tgroup.hdf b/tools/testfiles/Expected/tgroup.hdf
deleted file mode 100644
index 88a8232d50..0000000000
Binary files a/tools/testfiles/Expected/tgroup.hdf and /dev/null differ
diff --git a/tools/testfiles/Expected/thlink.hdf b/tools/testfiles/Expected/thlink.hdf
deleted file mode 100644
index a54ed0a994..0000000000
Binary files a/tools/testfiles/Expected/thlink.hdf and /dev/null differ
diff --git a/tools/testfiles/Expected/tloop.hdf b/tools/testfiles/Expected/tloop.hdf
deleted file mode 100644
index 862d37e4dc..0000000000
Binary files a/tools/testfiles/Expected/tloop.hdf and /dev/null differ
diff --git a/tools/testfiles/Expected/tmany.hdf b/tools/testfiles/Expected/tmany.hdf
deleted file mode 100644
index eb81862217..0000000000
Binary files a/tools/testfiles/Expected/tmany.hdf and /dev/null differ
diff --git a/tools/testfiles/Expected/tslink.hdf b/tools/testfiles/Expected/tslink.hdf
deleted file mode 100644
index bb1ae97d9a..0000000000
Binary files a/tools/testfiles/Expected/tslink.hdf and /dev/null differ
diff --git a/tools/testfiles/Expected/tstr.hdf b/tools/testfiles/Expected/tstr.hdf
deleted file mode 100644
index 5507e245f0..0000000000
Binary files a/tools/testfiles/Expected/tstr.hdf and /dev/null differ
diff --git a/tools/testfiles/Expected/tstr2.hdf b/tools/testfiles/Expected/tstr2.hdf
deleted file mode 100644
index dc4df5bcfe..0000000000
Binary files a/tools/testfiles/Expected/tstr2.hdf and /dev/null differ
diff --git a/tools/testfiles/Expected/vdata_test.h5 b/tools/testfiles/Expected/vdata_test.h5
deleted file mode 100644
index d81a34bb20..0000000000
Binary files a/tools/testfiles/Expected/vdata_test.h5 and /dev/null differ
diff --git a/tools/testfiles/Expected/vdnameclash_test.h5 b/tools/testfiles/Expected/vdnameclash_test.h5
deleted file mode 100644
index d5d6190749..0000000000
Binary files a/tools/testfiles/Expected/vdnameclash_test.h5 and /dev/null differ
diff --git a/tools/testfiles/Expected/vg_all_test.h5 b/tools/testfiles/Expected/vg_all_test.h5
deleted file mode 100644
index be3b7561b6..0000000000
Binary files a/tools/testfiles/Expected/vg_all_test.h5 and /dev/null differ
diff --git a/tools/testfiles/Expected/vg_hl_test.h5 b/tools/testfiles/Expected/vg_hl_test.h5
deleted file mode 100644
index a12eecdc23..0000000000
Binary files a/tools/testfiles/Expected/vg_hl_test.h5 and /dev/null differ
diff --git a/tools/testfiles/Expected/vg_loop_test.h5 b/tools/testfiles/Expected/vg_loop_test.h5
deleted file mode 100644
index 507d6251c6..0000000000
Binary files a/tools/testfiles/Expected/vg_loop_test.h5 and /dev/null differ
diff --git a/tools/testfiles/Expected/vgnameclash_test.h5 b/tools/testfiles/Expected/vgnameclash_test.h5
deleted file mode 100644
index 0d4e4631b2..0000000000
Binary files a/tools/testfiles/Expected/vgnameclash_test.h5 and /dev/null differ
diff --git a/tools/testfiles/anno_test.hdf b/tools/testfiles/anno_test.hdf
deleted file mode 100644
index 3b6d7d9bd4..0000000000
Binary files a/tools/testfiles/anno_test.hdf and /dev/null differ
diff --git a/tools/testfiles/gr_typ_test.hdf b/tools/testfiles/gr_typ_test.hdf
deleted file mode 100644
index 5d70e3e0cd..0000000000
Binary files a/tools/testfiles/gr_typ_test.hdf and /dev/null differ
diff --git a/tools/testfiles/grnameclash_test.hdf b/tools/testfiles/grnameclash_test.hdf
deleted file mode 100644
index 2f385aefc8..0000000000
Binary files a/tools/testfiles/grnameclash_test.hdf and /dev/null differ
diff --git a/tools/testfiles/image_attr_test.hdf b/tools/testfiles/image_attr_test.hdf
deleted file mode 100644
index 8a9f32982b..0000000000
Binary files a/tools/testfiles/image_attr_test.hdf and /dev/null differ
diff --git a/tools/testfiles/ras24il.hdf b/tools/testfiles/ras24il.hdf
deleted file mode 100644
index d2d6ae5cf2..0000000000
Binary files a/tools/testfiles/ras24il.hdf and /dev/null differ
diff --git a/tools/testfiles/ras_24_test.hdf b/tools/testfiles/ras_24_test.hdf
deleted file mode 100644
index 1bafe9c6df..0000000000
Binary files a/tools/testfiles/ras_24_test.hdf and /dev/null differ
diff --git a/tools/testfiles/ras_8_test.hdf b/tools/testfiles/ras_8_test.hdf
deleted file mode 100644
index 2fec68ac10..0000000000
Binary files a/tools/testfiles/ras_8_test.hdf and /dev/null differ
diff --git a/tools/testfiles/sds_attr_test.hdf b/tools/testfiles/sds_attr_test.hdf
deleted file mode 100644
index 7e7323f52a..0000000000
Binary files a/tools/testfiles/sds_attr_test.hdf and /dev/null differ
diff --git a/tools/testfiles/sds_dim_test.hdf b/tools/testfiles/sds_dim_test.hdf
deleted file mode 100644
index 53d71b9066..0000000000
Binary files a/tools/testfiles/sds_dim_test.hdf and /dev/null differ
diff --git a/tools/testfiles/sds_typ_test.hdf b/tools/testfiles/sds_typ_test.hdf
deleted file mode 100644
index b2d9fcbef1..0000000000
Binary files a/tools/testfiles/sds_typ_test.hdf and /dev/null differ
diff --git a/tools/testfiles/sdsnameclash_test.hdf b/tools/testfiles/sdsnameclash_test.hdf
deleted file mode 100644
index d32070bf4d..0000000000
Binary files a/tools/testfiles/sdsnameclash_test.hdf and /dev/null differ
diff --git a/tools/testfiles/vdata_test.hdf b/tools/testfiles/vdata_test.hdf
deleted file mode 100644
index f44bad8209..0000000000
Binary files a/tools/testfiles/vdata_test.hdf and /dev/null differ
diff --git a/tools/testfiles/vdnameclash_test.hdf b/tools/testfiles/vdnameclash_test.hdf
deleted file mode 100644
index 5ec91fc3c6..0000000000
Binary files a/tools/testfiles/vdnameclash_test.hdf and /dev/null differ
diff --git a/tools/testfiles/vg_all_test.hdf b/tools/testfiles/vg_all_test.hdf
deleted file mode 100644
index 94f51c23a8..0000000000
Binary files a/tools/testfiles/vg_all_test.hdf and /dev/null differ
diff --git a/tools/testfiles/vg_hl_test.hdf b/tools/testfiles/vg_hl_test.hdf
deleted file mode 100644
index 367fcd655b..0000000000
Binary files a/tools/testfiles/vg_hl_test.hdf and /dev/null differ
diff --git a/tools/testfiles/vg_loop_test.hdf b/tools/testfiles/vg_loop_test.hdf
deleted file mode 100644
index c2ce53b320..0000000000
Binary files a/tools/testfiles/vg_loop_test.hdf and /dev/null differ
diff --git a/tools/testfiles/vgnameclash_test.hdf b/tools/testfiles/vgnameclash_test.hdf
deleted file mode 100644
index 269f36ea2a..0000000000
Binary files a/tools/testfiles/vgnameclash_test.hdf and /dev/null differ