Fixes to the hdf5 catalog + tests