Fix test failures introduced by 78d8f05c218cab107255c4dc1a1344aef138d379