Update plugins/tests to deal with changes made to this vendor'ed code
This will break building, as the plugins will need to be updated for the new signatures.