Clean up 23-01-Metadata test as discussed during demo#8150

zjs merged 2 commits intovmware:mastervmware/vic:masterfrom

zjs:topic/test-demo-cleanupzjs/vic:topic/test-demo-cleanupCopy head branch name to clipboard