Fix tests
Merge pull request #1843 from erwinwinder/master

Fix tests