Clean up tests: use wtu whenever appropriate.

Please take a look.