Added Event definitions
Added Event Tests