Updated EmailEvents and test cases.