added more unit tests and using Qos data