Remove dependency (seantis.dir.events)
Add tests