Fix tests
Merge pull request #1854 from erwinwinder/master

Fix tests