Changes in dict keys for event tests

Fixes: #852