Fix test baseline.
Add additional error recovery tests.