Fix tests and add a throttle.

Event triggering still seems to not work as expected...