Merge "Expanding VTS test coverage"