Fix tests
Vagrant Support - not fully tested

[ci skip]