Fix failing tests post-merge with Master.