Merge "Revert "Update vts test to use the updated test template.""