Split concerns
Checkpoing for directive abstraction / tests