Update unit test tools according to the error code changes
Merge pull request #287 from zhang-jingwang/master

Update unit test tools according to the error code changes