Get order of repeated >{} or <{} directives correct and add tests