Refine events
Add more test events