Update tests for new plugin interface