Fix test failures due to recent changes for bug [1065461].