fix failures in MDC related tests due to interference