Event command binder wasnt properly repooling events. Clean those up and...

... fix tests