TQA-1507: Review and fix fail cases