Update to be up to date with BuilderCI template. Hopefully this will make the tests actually give up their VMs when they're done.