Cleaned up old tests and removed Event#=~ for now to revisit later