ENG-6388 fixed some failing tests