Merge "Fix DPM unit tests"