Merge changes Ib0305e63,I3af03854 into rvc-dev

* changes:
  Update CTS test files
  Add more tests for coverage