more tests
and more tests
more tests
more tests
more tests (and fixes)