ENG-5502: Fix test failures.