Merge "Update vts_fs_test to reflect VSR."