First batch of VT pip test fixes