Fixing test failure introduced by 7070662