Merge "Change vts target base test class name"