Update test Vagrantfile to work with heira
Small cleanups of functionality