fix tests after 'Revert escaping of underscore characater 71a3938'