Merge "Secretkeeper: improve VTS tests" into main