[WIP] Work on API extension and unit tests
Settle on QoS convention
Remove unusued test_qos file
Fix typo