Issue #464 completed. Unit tests was fixed.
Merge pull request #472 from nazariitashak/test

Issue #464 completed. Unit tests was fixed.