Merge "Add update tests for policies and rules" into feature/qos