ENG-5877 Fix unit tests.