Merge pull request #23 from tribal-tec/master

Fix tests on travis
More fixes for headless unit tests