.
.
.
.
refactoring some directives and tests
refactoring some directives and tests