- Fixed tests, now that events should be firing as expected.