add comment, fix tests