Fix unit tests
Merge pull request #12 from elandau/event_bus

Fix unit tests