Fix test failures correctly.