Refactored the recovery tests