Updating tests per code review.