Improve test error recovery

When a test fails the release is in a somewhat indeterminate state. We need to examine how to best clean this up and/or continue from environmental failures.