Added Vagrant capabilities and fixed tests