Ve 1290 Update VE tests to work after Up Stream Sync