test-vm.sh: small updates to match other recent test scripts