Merge "Fix some WM unit tests" into oc-dev