Fix recovery tests

This solves the problem encountered in #90.
Merge pull request #98 from maxnordlund/fix-null-tests

Fix recovery tests