Updated tests
Merge pull request #22 from ssOleg/develop

Updated tests