More clean safe imports
Minor refactorings
Fix wrong method call in spec
Remove dependency of trigger module in event specs
Move trigger specs where they belong
Fix event types in specs