XD-896: Revert AbstractMessageBusTests