For #1724: Fix unit test after 7f7d6c8186b5609a853a4074e225328c6d40b095