Fix events (port bug fix from devel)
Reorder and rename test
Fix {{> content}} data context