Fixed tests.
Merge pull request #17 from ss/master

Fixed tests.