Fixed failing tests.
Merge pull request #199 from EntityReborn/master

Refactored event storage to ExtensionTracker only.
Merge origin/master
Added tests for new switch syntax and fixed bug in switch.
Refactored function storage to ExtensionTracker only.