more unittest fixes