Update event listener linkers and test cases