ENG-7380: Fix tests.