Merge "Add all prior VTS tests"