Various failures in the full test which have nothing to do with the change, it looks like.

Will merge.