Make the unittests pass
Merge pull request #137 from globaleaks/fix/unittests

Make the unittests pass