Update VE tests for current behavior, verified no bugs

Change-Id: I401c95026d45a30599f4fe4d864eda79a11c000c