More unittest tweaks