Merge pull request #75 from eile/master

Improve unit tests
Merge pull request #77 from eile/master

Really fix dso test on Ubuntu