Simple fixes in UTs

In general, lessen console noise during build, and some minor cleanups.