Updated tests
Merge pull request #1 from kurjam/tests-update

Updated tests