Refactored eventbus for domains and corrected unit tests