Converted most of the tests to function-style tests in preparation for abandoning testify.