Cleanup of test classes (moved to resources). Simplified the concept of
the event bus.