add more test cases for issue #525