moved clustermanager out of event bus + increase test timeouts