Clean up testutil a little