updated tests
Merge pull request #65 from waalzer/master

updated tests