Syntax fixes and new tests for plugins.