additional unittest fixes