add more test and re-fix TW-26658