Bring back other event tests nuked, make then non-specific to removed "Event<?>" muck