Merge "Fix various DRM related tests"