Merge "Tear down VD in test to ensure it doesn't interfere with other tests"