Changed method arguments to contain options hash.
Fixed some formatting issues.
Added more event-specific fields to unit tests.