Fix the eventcontroller tests