Fix 456290 fix unit test associated with this change

Signed-off-by: Pengcheng Bian <pbian@actuate.com>
Merge pull request #51 from TerryPCBian/master

Fix 456290 fix unit test associated with this change
Merge remote-tracking branch 'upstream/master'