Merge "Fix run-test after introduction of VDEX"