started fixing test-cases
Merge remote-tracking branch 'origin/EventClass' into EventClass