Merge "Fix Power VTS test setup code"