small fixes
more tests