more tests
more tests
more tests and fixes