simplified unit testing
fixed travis build
Merge pull request #114 from romankonz/master

simplified unit testing