small tweaks to plugin handling and tests