small fixes, add tests
Merge remote-tracking branch 'origin/master'