Fix unit tests broken by 1e78a5df7
Merge pull request #1656 from maurizi/fix-unit-tests

Fix unit tests broken by 1e78a5df7