fixed test and added test report
Merge remote-tracking branch 'origin/master'