Fixed ZEN-14062 issue
Updated tests
Merge pull request #19 from ssOleg/develop

Fixed ZEN-14062 issue