Minor UT cleanups