Merge "Add missing instantiation code for Vts tests"