Some unit test cleanups