ENG-6388 fixed more failing tests