Add rspec-mocks, for better mocking and stubbing.
small event adjustments
Introduce watcher concept