updated tests
Merge pull request #50 from waalzer/master

updated tests