Fixed tests
Merge pull request #158 from K-Phoen/fix-tests

Fixed tests