ENG-6855: Fix broken tests.