Put tests around email highlights and update the class/structure as appropriate.