Fix failing tests from 2.x merge.