few comments, some more tests