Add plugin test
Fix comments left over from debugging.