Merge "[AWARE] Fix unit tests" into oc-dev