small fixes
more extensive tests
more tests