More directives, more testing