For ENG-6718, fix broken testcases.