Update PluginUtils and add 2 plugin tests