Add comment, fix tests