Merge "Refactor test harness for generated VTS tests" into oc-mr1-dev