Add more event support and test-cases.