Test fix: To remove warnings.
Merge pull request #66 from huangpf/dev

Sync with WA repo