Docs cleanup
Fixup event tests