Fixing tests and resolving remaining communication between broker and node for deployments