Add additional recovery test.
Fix test failure.