Jeremy/testutils

Whoops! Good catch. I did that while I was debugging.