Ensure 100% code coverage; Add event arguments and trigger point