Formatting changes
Renaming variable
Adding unit tests for events
Updating phar