Fix test and update comments.