[MC] Merged tests conflicts