Unit test fix after latest patch
Merge pull request #4726 from dballesteros7/unittest-fix

Unit test fix after #4653