Fix failing tests after merge