final unittest fixes