Merge "Adds tests to cover QOS policy"