few more tests and fixes