1. fix a regression bug
2. add more test scenario