#193: more tests and fixes