Added tests for events
Some methods for dealing with tokens