Fix highlight tests (and a quirky behaviour where the highlights were not dismissed when user clicks on something that's not a brace)