pass in hilight flag to renderer
add tests for not highlighted
simple move previous
highlight moves from add to last
remove test duplication with macro