Updated unit tests
Merge remote branch 'upstream/develop' into develop
Merge pull request #22 from ssOleg/develop

 Updated unit tests