Fixing unit tests problem (#232)
Merge pull request #244 from egor83/master

Fixing unit tests problem (#232)