Merge "Adjusted tests to account for async changes" into oc-dr1-dev