Fixed unit tests
Merge pull request #37 from ssirushchyshyn/develop

ZEN-15753