Small tests now working with new HDF5 structure