added fixes for directive unit tests