Fix test failures on the bot.