HM/TJ: remove spaces and improved message on assert{Not}Substring