[PATCH 0/2]: Minor unittest fixes