Registering interfaces for eventbus communication
Additional tests
Refactor tests