updated tests
Merge pull request #53 from waalzer/master

updated tests