Update plugin interface
Fix conditionals
Update plugin
Update TestPlugin
Add more comparisons