Revert to functional HDF5 tests

Created by: williamfgc

For some reason I messed up my rebase and ended up merging the wrong version for the HDF5 tests. Will revert to before PR #644