Fix unstable recovery tests