Fix mixins
Rename events to actions in routers
Fix errors in tests