Fix unit tests
Merge pull request #2195 from dennishendriksen/master

Fix unit tests