Merge "Fix tests?" into oc-dr1-dev