[wallace] fixing csf failing scnearios