added new directives and tests