added error log test
Merge origin/master