modify docs, simplify directives, modify test