Fix some whitespace issues. Improve and correct an events test.