Added Directive and tests