Merge "Minor fixes on VTS tests" into tm-dev