Merge "Update VTS tests with the new test harness."