Fix unstable recovery tests
Merge pull request #129 from wajam/manu-fix-recovery-tests

Fix unstable recovery tests