fixed tests
Merge pull request #17 from zelgerj/master

fixed tests
merging with techdivision