ENG-5899 Fix unit tests.