Updated Core.Events and tests