Some more unittest fixes