ENG-6898: fix tests.