Improve test fade for update events
Finish event binding for update events