Add AttachEvent + tests
Revert wrong fix for Button test