Merge pull request #245 from shenrie/master

Removed unnecessary function and fixed test
Temporarily comment out event object validation