Clean up tests: use wtu whenever appropriate.
Merge pull request #719 from zhenyao/clean

Clean up tests: use wtu whenever appropriate.