Updated for test Vagrant integration