Switch the rest of the tests over to using test framework.