More fixes for headless unit tests
Merge pull request #24 from tribal-tec/master

More fixes for headless unit tests