Fix test failures again.
Merge pull request #183 from eric-wu/develop

Fix test failures again.