More extensive recovery testing
Typo
Rename script