Some unit test tweaks