fixed fileplugin testcase
fixed fileplugin tests
Merge branch 'master' into unstable