Merge "[AWARE] Fix unit tests"