Fix unit tests
Merge pull request #377 from tribal-tec/master

Fix unit tests
Fix unit test for real