minor cleanups in unit tests