updates to plugin and tests