Merge "Secretkeeper: more VTS tests" into main