Fix test suite, upstream changes on dialog.