Merge "VTS tests should be static" into pi-dev