Test highlighting, class sorting and a more compact list