More handling of failing tests.