Merge "[AWARE] Unit tests" into qt-dev