PluginTest fixes
AndFilter tests/fixes