added a recovery integration test
26 files changed