Fix tests with new plugin support