Fixed timing on test with intermittent failure
Fixed timeout error in Event class.