Merge "Minor improvement in: test_qos_basic_and_update"