Corrected event evaluation by the event_type. Fixed the specs to reflect the change

#3666
Merge pull request #97 from NUBIC/3666

Corrected event evaluation by the event_type. Fixed the specs