修正测试用例等
Merge pull request #525 from wangxiao/plugin

修正测试用例等