Modified EventTests and Event