Fix four test cases
Merge pull request #1978 from Randy-Ma/master

Fix four test cases