recovery tool test unit fixes