more tests, general code conventions fixes
Merge remote-tracking branch 'origin/master'