Test fixes and updates based on the review.