MDL-47494 ddmarker: Fix unit tests for 3.0 compatibility.