move the recovery step from teardown to setup