XD-896:Reverted MessageBusSupportTests