Fix unit tests
Merge pull request #389 from geoadmin/dev_fix_unittests

Fix unit tests