Fix problem with aborted tests.