MDL-43736 Events: Fixed broken event data and unit test