All initial tests passing with exception of event system