Merge "Enable some fixed tests" into oc-dr1-dev