Updated the event model a bit
Fixed event model and setup data
Added todo comments for event sync test