Update TbHtml.php and its tests