Update Unit Tests

Update the appropriate unit tests to start using the Basic event class, instead of the old Event class.
Merge branch 'basic-event'