Fix test and address last comments.