Improved tests coverage.
Fixed couple minor bugs.
Merge pull request #2 from przemekmazurek/BUG_3850

Improved tests coverage.