Fix test failures again.