Merge pull request #35 from JeffScaturro/JeffFunctional

Event functional tests