Fix UT with previous modifications
Add metadata to Event