Fix test failures caused by recent changes.