Merge "OMS: add internal tests" into qt-dev