Revert "more temporary test hacks."

This reverts commit 0f8b4f179a2fcd65b2d622b92244ee883c2bceac.
Revert "test helpers"

This reverts commit a2a731b6d0de95baf708c8b92e3a120208bfba74.