Cleanups with bput-bgetn test