some more tests and fixes