Add param in Admin Tool
Modify some error in test
Merge remote-tracking branch 'origin/master'