ENG-6388 fixed failing tests