Merge pull request #153 from seccubus/master

Unit tests should work again