Minor fix for "Remove text for HI" + unit test