Add tests for merging Qos.
Merge pull request #979 from adrian-rosello/fix/merge-qos-on-update

Add tests for merging Qos.