Fixed trigger event
Updated unit tests for trigger event