Changed todo
Added eventtitleaddon to tests
Merged in eventtitleaddon change