Fixed tests
Merge pull request #2 from chives/master

Fixed tests