Fix test that was not updated.
Merge branch 'master' into v4.x