refactor recover tests