ENG-5114: fix tests