Unittest tweaks
Merge pull request #9 from jenssegers/master

Unittest tweaks