Improve failure detection in the test suite.