Fixed minor issue with "Remove text for HI" + unit tests