Merge from Perforce
Fix some bugs in report test cases