Further H5Container tests + cleanup