Merges #127 and adds Directives e2e tests

Merged @kilianc's branch and added Directives specific e2e tests for this merge.
Closes #75 and #125.