TESTUTIL: Adjust the rest of testutil