event fixed
Test bugs fixed
Merge remote-tracking branch 'origin/test'