added missing events, unit tests for all events
fixed test error