Fixes for changes to WellBehavedPluginTest