Update comments, fix test