issue #3541 : Fix bugs for test cases.

Fix bugs for test cases.